improve directory layout