Further changes to the class path that changes build order in order to only require two builds after cleaning.