New package structures under EricHuang2 directory

Removed jws references in build.xml.
Modified package structures according to new conventions.

I'm not sure if we're supposed to remove the folders that has jws stuff inside so I leave it there.