Start of a webjar module
* updated macro names