Layers refactoring
5 files changed