Removing old code, plus updating README a little.
Moved stuff around, and fixed setup_commands