Removed old files and re-organised