[Feature] Fix ArchUnit entity violations

[nramc]

Overview / Introduction
Here..!

Acceptances Criteria
AC 1:
AC 2:
AC 3:

**Additional Contexts **