More refactoring, removing files from before last refactor