Avior is now split into multiple files. More functionality to come