neatened directory structure