Revert back to original code structure