Refactor and restructure.