Organizing layouts structure (preparing for hyde 2.1.0)