core: rebarize some more files