Added support for Areas, additional namespaces overload plus a bit of refactoring.