Refactoring
Removed unused files