structural changes, with build file