JAL-3130 Some re-reorganisation for build process