Sync to make everything compile, now start adding old modules