Restructure script bundles and files