Updating files to follow the new clu namespace
Merge https://github.com/nuclearfossil/clu