Finalise (More reorganisation + Updating README)