Move dao implementations to the same folder; Update test data locations in tests.
Move cache implementations to the same folder.