[HB] Move typedef's around
drwxr-xr-x - src