Classes moved from newproj package