Upstream updates, moving modules back to profile