Cleanup repo structure