some serious moving, setting up sahi as multi module project