Adding licence and refactoring namespace.