deleted old bootstrapping and test directory
new generated build file
bootstrapped generation
fixed erroneous merge (correct imports, correct strategy names +
arities)