Config changes, basic file structure