Feature/#80 - some initial bic reg work including moving some classes into a package - hence early merge - not finished yet