Remove facades include
Have console application use abstraction and move commands to an include