service: adjust file structures