Properly separate classes out into separate files