Better structure for builds.