Revert "removed unused bundle folders"

This reverts commit 6558503ec5a57275290ce4d384655cde893a8a97.
cleanup