Make class serving work, tidy up file names
fix for changed class names, split up build step