refactoring, commands moving across folders