cleaned up package structure in DAL