Updating: reorganizing some files