Update to new macros
Move documentation to doc subpackage