Sort out require calls for new structure