Updated package structure slightly.
Some small cleanups.