Restructured the atlas for the new ones