Revamp the structure