Moved implementation components to separate bundles