change pkg define; add proguard config
move in Server src for ant build