Config, folder restructure