simplify design, remove multi module support