Restructure repo - collapse PN-PV level