refactoring namespaces
using NamedCommands, refactoring