updated the .ckt files and split into a more logical hierarchy