New package structures under EricHuang2 directory

Removed jws references.
Modified package structures according to new conventions.