Refactoring, removed unnecessary files