Moving bundles.
Code cleanup.