minor package cleanup
The directory structure was wrong. This pr cleans that up (and removes a log4j file that shouldn't have been there.
The directory structure was wrong. This pr cleans that up (and removes a log4j file that shouldn't have been there.