Fix namespace
Refactoring Core

Generate documentation