Move classes to init