changed package names in eclipse, maybe cleanup here too