Moved files containing macros to the Environment subdirectory.