Refactored java package structure

Change-Id: Ifaae19b96073e0d6096a73fc2e8ab8f41712b8ee