- removed obsolete categories & classes
- updated categories and files structure