partial commit of wrapper skeleton restructuring
partial commit of wrapper skeleton restructuring

chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster