Repo structure cleanup and README update