directory layout cleaned up