reorganizing, preparing sample app