Moving around some packages and renaming some bundles to match their ultimate names and locations within Felix.