Moved libraries to subfolders