Put all classes into a namespace and with better names.