Move the maintained common-use packages back to the bockbuild repo