Cleaned up package structure to make better sense