Refactor layer classes