Fixed some compile-time bugs. Renamed namespace.