Removing unused files and re-organised