Created Knife and Metal utils. Cleaned up some factory objects