Refactoring S-Expression

Change S-Exp. hierarchy.