move functions to autoload
rename/move api functions to prevent autoload on startup
cleanup