Restructure layout for better packaging possibilities.