Repository structure changes

And a lot of mistake fixes. Need to go rest now…