First step of restructure.
Intermediate commit.
Intermediate commit.
Intermediate commit.
Intermediate commit.
Adding config...
Intermediate commit, ready to merge to the master.