move variable definitions and mapping definitions to autoload/