Split unit set project to intrusive and non-intrusive ones