Moved commands
Moved commands, added statics and code cleanup