- changed class names
- added missing files