Refactor assembly boundaries