Final commit of this project as I am going to separate components into
different maven builds.