Namespace refactoring
Command pattern