Reorganized the main repo to satisfy RSR-0