change package names to fix eclipse, remove old files