Deleted unnecessary files, some code refactoring