Move commands into separate package