Reorganize Sample Config