Finalized refactoring (removed DAO classes, added data layer)