Cleaning up CDASimulator folder structure.
Merge pull request #15 from walter-cavinaw/walter

Cleaning up CDASimulator folder structure.