More setup.

Directory restructure