Refactored - modules use import qualified