Start to tidy directory structure