More refactoring: removed old files