moved many files into better folders