refactored the Command.scala composite file structure into a new package of classes