Moving classes out to files