Restructure, post-build data copy