Adding CP arch
Fix, but relative imports kaput
Improved parser