Move layouts out of libraries

Now consistent with @phproberto PR