Renamed folders to updated names

GitHub appears to like lowercase, and long folder names with different
hyphens and underscores are ghastly