move way-related stuff into a separate file