Made CADs namespace-private and removed all dependencies on them.
Merge branch 'master' of https://github.com/unok-kun/HTFM