1.1 - Match HTTPS

And folder structure change