Package/Class cleanup.

By: Ace