Moved some more methods into modules