Add solution folders, fix build order