Rework of Layers, Scripting and code refactoring.