Reorganized packages for 312, included parsing

Parsing exercise, still undone since I missed last week