Reorganised to standard folder structure
Removed leftover ~ file
Added ~ files to gitignore