Organization

Moved commands into their own package