reorganized setup to use 2 modules