Formatting update

Formatting changed into a more hierarchical structure.