Re-organized solution structure