More refactoring.
Removed unused files.