Cleaning up dir structure and updating README