Moved Commands into separate module