Merge topic/reorganization.

This is a heads up: I want to merge the branch topic/reorganization into master, and that will touch almost every file.