Reorganization with new dao/model/tumblr packages.