Improved environments, changed names
Moved environment definitions to separate file