Layer refactoring is ongoing