[shim] - refactor public folder