Move assembly to package phase