Fixing structural issues of eclipse project