changed names of generic dao and its abstract implementation, also moved to proper folder
fixed wrong cache names