[FEATURE] Update structure to be fully compatible with version 7.x and 8.x