Removed tmp files
Moved files around, more refactoring