More or less finished moving commands from central file to modules