Split obstacles and locality databases into separate namespaces

Signed-off-by: Martin Evans <martindevans@gmail.com>