Group the methods in modules
Added freetext searching