[MacOSX] Reorg and preparation to include scripts into Bundles