Some general changes; Created a seperate class for each command