Restructure; replace frames and skins layers with pattern layer