Beginning of major refactoring to support V2
Fix namespace/file locations #22
gitignore update