Rename directory, as not bash specific
Move additional files to environment imports