Re-organizing the repo.