Cleaned up the packaging layout