Pattern Library: layout structure cleanup

Signed-off-by: Brandon Rosage <brandon.rosage@gmail.com>