re-organize bundles
clean up config