Revert to separate modules