Reorganized repo structure while preserving history