pedantic fix to test error msg
cleanup file structure
clean up deps