moved packages and added some tests