Restructure Application for Semantics