Moved the isolation support module to the common module.
Other minor readability adjustments.
Removed duplicated layers.