changed folder stucture and used namespace instead