Revamp structure for the sake of simplicity ...