Tidying up files and directory