started merging sample and library apps