Move config commands to appropriate file