Formatted wsdls
Organized some classes, removed unnecessary files
Conflicts merged