Rebrand and refactor