Moving things into proper directories for turn in