Bootstraped nancy in project and moved some namespaces
Merged master from upstream