Moved Command Directroy into a separate file and package