- modifying dependencies for split branch
- fixing import for the split changes
update master
delete classpath and project