tidying up

moving room into seperate folders
moving some of the functionality of the larger classes into seperate
classes