Added Soap classes structure
Fixed soap class structure