Authentication works (tests required)
Reshaping classes and functions