more changes to allow easier import into Eclipse