* Added revision date and a bit of reorganization