Change commands into a more modular, clearer and easier to use func map and do the changes that comes with that.