Initial changes to auth module structure
Merge branch 'feature/auth_changes' into develop