Added OS name to package and adjusted paths.