code cleanup - move commands to separate package