Moving commands to more logical place
Bringing mount config, tests back in line