Moved avalon files around