Cleaning up repo structure