Consolidate modules. Add first simple Spock test for the HDS Builder