Restuctured project to fix eclipse import errors.