Moved projects to correct folders and renamed test projects.