merged helper modules
restructured commands
restructured commands