fixed namespace
fixing factory
fixing dependancy