Renamed some classes and dirs to better reflect their purposes. Added Command Stubs