Root reorganized

Reorganized root structure.