rearrange modules, update Beta 7