Moving directory name so that it packages better. Must remember not to use hyphens