+1.
Im for splitting it up also. Makes it easier for someone who is new to find things.