Removing the Symboli link about the includes and layouts directories
Moving the includes and layouts directories