removed more unnecessary files/folders
added factories and deleted unnecessary folders