Moved classes in new command package