moved things into a library layout