Rename directories. Move challenges file to proper folder