removed android dependencies
moved some classes to daotest