added some missing classes, and changed structure of packages