Clean up repo structure