remove some cumbersome directory structure