#14 Move the methods to modules.