Fixed refactoring, some file deletions