(Apple) Reorganize source tree