WIP rename files to not have hyphens (-)