Evany Update

Small update to the structure of Evany.