refactor barrel layers