New layout

Integrate the new layout into the master branch. The version is now `2.0-SNAPSHOT` and all other enhancements will get into 2.0 as separate pull requests.