Add shared and utils and fix api import stuff