Moved files from the old library layout