New entities and repositories for HomeController + Reduce complexity
Files no longer used
Manual merge