Consolidate namespace. Fixed #5