switching to a feature based (and module-based) structure