Removing Commands.hs, renaming functions and moving JSON stuff to hw.hs