pcb and plots updated, folder reorg