new directory structure and cleanup