Cleanup javadoc and move a few types around
Fix SCR descriptor generation when doing a release