Merge pull request #2 from Nocross/repo-structure+dependency-management

Repo structure & dependency management