refactoring and removed unnecessary files