Merge pull request #1 from naneau/new-project-structure

Implementing new ABC Project structure