Functions in the commands package do not need exporting.
Use shorter name for some of the imports.