remove most unused things, no matter how cool they may seem to hunter.
remove unnecessary eclipse files/dirs
change things. nothing comceptual is going to be done
fix merge conflict
fix more merge conflicts