Removed unnecessary classes, updated package hierarchy. Updated old
components model class to expression file provider.