Moving the includes and layouts directories