Finish rearrangement to partis repo

Well, seems to work. I might have missed a few things still