Small reorganization.
New entity User and the required artifacts
Fleissarbeit ...