moved more stuff into correct folders