move handler and module to seperate assembly