Fixed up directory layout