Reorganization, added rhyme/portmanteau commands