Project Layout fix