Tweak legacy module for new structure