Updated README and changed structure back