Organised code for easier navagation

Don't worry about the 'deleted' tags. GitHub apperently doesn't like it
when you move files.