Re-organization of the repo