reorganized setup files