Removed duplicate files, tidied up branch a bit