Rename folders to follow Ruby convention more closely