Updated more structure and public api for fox module