Better sub package organization within dao package. Updated imports