Renamed the namespace structure