Fix make order
Simplification
remove the nameSpace
Update libs
Update libs