Merged in code from related, now deprecated, project
Renamed project