ENH: Restructure Atlas and add mrml support