v2

Project structure refactoring, new features added