Move types/ public headers up