rearraging config and include folders