clean-up, add solution folders, rearranged files