Added parsing tester skeleton, improved source file organization