Adding licensing header
Moving imports inside root namespace
Fixed other code review comments