separating library sources and demo app sources. step2