moved sample project
finished updated sample
fixed some issues cost by refactoring