Interim check-in of layer refactoring