moved things around for multi module setup