Cleaned up build so that mis-named (and mis-packaged) files don't get
re-compiled every single time.