[forge-dev] Major refactor - re-import to Eclipse may be beneficial