Removed generator (moved to a branch)
Namespace fixes
Added unit tests