Updated version for new release
Reorganised files to tidy up locations