reorganized setup for different environments