More accurate file type
Fix some naming
Remove Apache commons-io