Updated code templates to contain correct license header.
Fixed package structure to match other project structures.