Moved Java sources to directories that match their package statements (fixes compile errors in eclipse)
Added explicit null checks so we can see which param is null in case of failure.