Re-arrange bundles and delete unused packages
Re-add javascript bundles