Moving things into a subdirectory in preparation to merge into my sandbox project