Put core classes in extra module