Flatten HaloTypes module
Update namespaces
Merge branch 'master' into fsharp-dev