Update

- removed the support class
- renamed classes dir to lib