Merge latest stable changes

Adds SMS auth, SASS, project structure reordered