removed unused classes
clean up project and package structure
fix broken test