move config things from cli app
rearrange structure