Splitting classes out into seperate files