This also fix a few bugs that were introduced when migrating to namespace. Some non-namespaces classes were leftover FIX #15
FIX #14