Moved Command stuff to proper package
Updated imports