new directory structure, cleaning up