Move non-commands into separate package