Same code as revision except:
a) packages have been renamed
b) eclipse project file added