Fixing repo structure, and updating README