SASS Re-Arrange Architecture