Final cleanup, moving files around