Fixed all classes to conform to new console command architecture