Removed unused files and refactoring...