Namespace refactoring
Updated license