Reorganized packages to dao and bean and more boiler plate beans