Cleaned up package structure.