Changed the main package name.

Also, modified the code templates some more.