Moved files around and deleted useless ones