restructuring to a module for now