Complete basic samples and add extra samples scaffold