Fixing references in project.json, cleaning up namespaces

@divega