code cleanup :
1. adapted code to new structure
2. removed redundant classes