Feature/entity repository location move