Improved code readability

Pushed the layout classes to the right and pulled the semantic classes
to the left.