Finished refactoring rename structure.