reorganize around common and custom config