Reorganize Localisation namespaces closes #206