Moved packages and added test package