Add new project and some refactoring
Add new project and some refactoring