Changed source directory layout