Tidying up directory structure.