Re-factor: follow the new code structure