some tweaks on directory layout