Refactoring; Renamed, deleted and move several classes and assets