Version 0.3 - major refactoring and restructuring.
Remove CPPs
Remove CPPs