removed unused file
Created factories and moved stuff around.
added missing files