Moved files around and fixes references.