Refactoring entities - Trying to get Menu to work
Added new artifacts for infrastructure