Reorganized functions; put repository on new computer