Issue #2390997 by neardark: Upgrade 7.x structure to 8.x structure