Clean up folders to prepare for commit to main GeoTools repository.