moved models definition to separate source file
moved harvesting modules to separate package
proper module name