Defined production/testing/dev environments more carefully, and reorganized files