Try to fix make file.
Improve class namespace.