Added other files from old library layout