ROBE-34 Token BasedAuth and Auth module structure fixed
#ROBE-34 fix module structure and refactoring