Better package structure, commented out types

Same structure as generated by appium-package-master.