Further organization and consolidation

OS independent now, one version fits all. Current version in current
folder, past/deprecated versions in data folder.