restructure with config folder