Refactor/stories layers