Import 2D design and restructure project
Update pci references
Remove old makefile