renamed some packages and fixed project not getting imported in eclipse bug