[SATYR PATCH 1/2] Move public headers into separate directory