merge config and clean up dir structre