major refactor of namespace and project structure