Added Ranch dependency and structure modified