Restructure, prep for site-config
Add some config options.