Even more restructuring in skvitae.cls