Restructured folders organization.