Merged files from folders Sample1 and Sample2, added lib folder, added build.xml, removed jws reference, modified package structure according to new convention