refactoring: sepraration DataFromWeb & DataFromDB modules