Refactoring DataAccess layer, organize namespaces