Reorganize repo with new solve