Move classes in their own files
Accept more segment separators