Added classes for basic commands and seperated packages