Class/File refactoring
More refactoring. Yay