Tidying classes in src/idyno