Put most of the stuff in autoload

The mappings would not work because I forgot to move the functions they
were referring to with them