Refactoring Entities into it's own Module for easier handling of different Module combinations