Changed package structure, got DAO working