convert some modules to use groovy and restructure directories