Rearrange / Partial Add

Restructured the PNA folder; moved some more things in; progressed with
exercise 5