Merge JDA-Commands and Factories back into Ship-ENGR-Bot