Overall refactoring

-deleted unused files