tidying up file structure