Revert "Moved general functionality to shared"

This reverts commit d762a70e90e4c7ac13cdf2e729db4c4986ac064e.