Moving c302 code to new directory & minor restructuring