Updated layout, new path to libraries.