Remove more unwanted files from FMJ
Fix up build file
Re-add files I didn't mean to delete