Revert "restructured packages and introduced a commandhandler package."

This reverts commit a7275da59cb70686346a1f1502019e8f9abcc055.