Fix the Eclipse project mess
Fix the Eclipse project mess