Move functions to autoload files