Setup scripts reorganized