Added scalate based generation
Tightend up build deps