Renamed packages and added a little more code for commands