some refactoring and renaming the project to a more appropriate one