Move all the init stuff back into init

Where it belongs.
Fix autoloads with the wrong signature