More organization

moved things to the correct folders, since they didn’t do it the first
time.