From e369b0cc59d4cde8aba065ea031195299e46b091 Mon Sep 17 00:00:00 2001
From: leewyatt <leewyatt7788@gmail.com>
Date: Thu, 21 Nov 2024 14:04:53 +0900
Subject: [PATCH] Change DataRepository2 references to DataRepository

Renamed all instances of DataRepository2 to DataRepository across the project. This change aligns with the recent updates in the jfxcentral-data project, where DataRepository2 was deprecated and renamed to DataRepository. This update ensures consistency with the latest project structure and removes references to the now-obsolete DataRepository2.
---
 .../dlsc/jfxcentral2/app/JFXCentral2App.java  |  6 ++---
 .../jfxcentral2/app/JFXCentral2MobileApp.java |  4 ++--
 .../jfxcentral2/app/RepositoryManager.java    |  4 ++--
 .../dlsc/jfxcentral2/app/TrayIconManager.java |  4 ++--
 .../app/pages/DetailsPageBase.java            | 12 +++++-----
 .../app/pages/LinksOfTheWeekPage.java         |  8 +++----
 .../dlsc/jfxcentral2/app/pages/StartPage.java |  6 ++---
 .../dlsc/jfxcentral2/app/pages/TeamPage.java  |  4 ++--
 .../app/pages/category/BlogsCategoryPage.java |  4 ++--
 .../app/pages/category/BooksCategoryPage.java |  4 ++--
 .../pages/category/CompaniesCategoryPage.java |  4 ++--
 .../category/DocumentationCategoryPage.java   |  4 ++--
 .../pages/category/DownloadsCategoryPage.java |  4 ++--
 .../category/LearnJavaFXCategoryPage.java     |  4 ++--
 .../category/LearnMobileCategoryPage.java     |  4 ++--
 .../LearnRaspberryPiCategoryPage.java         |  4 ++--
 .../pages/category/LibrariesCategoryPage.java |  4 ++--
 .../pages/category/PeopleCategoryPage.java    |  4 ++--
 .../pages/category/ShowcasesCategoryPage.java |  4 ++--
 .../app/pages/category/TipCategoryPage.java   |  4 ++--
 .../app/pages/category/ToolsCategoryPage.java |  4 ++--
 .../pages/category/TutorialsCategoryPage.java |  4 ++--
 .../pages/category/UtilitiesCategoryPage.java |  4 ++--
 .../pages/category/VideosCategoryPage.java    |  4 ++--
 .../app/service/LoadPullRequestsService.java  |  4 ++--
 .../app/utils/RepositoryUpdater.java          |  4 ++--
 .../components/FeaturesContainer.java         | 22 +++++++++----------
 .../components/LearnPaginationBox.java        |  8 +++----
 .../components/LibraryPreviewBox.java         |  4 ++--
 .../components/LinksOfTheWeekView.java        |  6 ++---
 .../components/MemberCellView.java            |  4 ++--
 .../components/PacksIconsView.java            |  4 ++--
 .../jfxcentral2/components/TopMenuBar.java    |  4 ++--
 .../components/WeekLinksLiteView.java         |  4 ++--
 .../components/detailsbox/DetailsBoxBase.java |  6 ++---
 .../detailsbox/LibraryCoordinatesBox.java     |  4 ++--
 .../filters/DocumentationFilterView.java      |  4 ++--
 .../components/filters/LearnFilterView.java   |  8 +++----
 .../filters/ShowcaseFilterView.java           |  4 ++--
 .../components/filters/VideosFilterView.java  |  4 ++--
 .../headers/PersonDetailHeader.java           |  4 ++--
 .../overviewbox/BlogOverviewBox.java          |  4 ++--
 .../overviewbox/BookOverviewBox.java          |  6 ++---
 .../overviewbox/CompanyOverviewBox.java       |  6 ++---
 .../overviewbox/DownloadOverviewBox.java      |  6 ++---
 .../overviewbox/LearnOverviewBox.java         | 14 ++++++------
 .../overviewbox/LibraryOverviewBox.java       |  6 ++---
 .../overviewbox/ShowcaseOverviewBox.java      |  6 ++---
 .../overviewbox/TipOverviewBox.java           |  6 ++---
 .../overviewbox/ToolOverviewBox.java          |  6 ++---
 .../overviewbox/TutorialOverviewBox.java      |  6 ++---
 .../overviewbox/UtilityOverviewBox.java       |  4 ++--
 .../overviewbox/VideoOverviewBox.java         |  4 ++--
 .../components/tiles/LearnTileView.java       |  4 ++--
 .../components/tiles/PersonTileView.java      |  4 ++--
 .../components/tiles/SimpleTileView.java      |  4 ++--
 .../topcontent/TopContentContainerView.java   | 18 +++++++--------
 .../jfxcentral2/utils/IkonliPackUtil.java     |  4 ++--
 .../utils/QuickLinksGenerator.java            |  6 ++---
 .../mobile/components/LearnListCell.java      |  4 ++--
 .../mobile/components/LearnPagination.java    | 10 ++++-----
 .../mobile/components/LinkedObjectsBox.java   |  4 ++--
 .../mobile/components/LotwPagination.java     |  4 ++--
 .../components/MobileBlogOverviewBox.java     |  4 ++--
 .../components/MobilePersonDetailView.java    |  4 ++--
 .../mobile/components/MobileSearchView.java   |  6 ++---
 .../mobile/home/CategoryPreviewView.java      |  4 ++--
 .../mobile/home/WeekLinksView.java            |  4 ++--
 .../mobile/pages/MobileHomePage.java          | 16 +++++++-------
 .../pages/MobileLinksOfTheWeekPage.java       |  4 ++--
 .../category/MobileBlogsCategoryPage.java     |  4 ++--
 .../category/MobileBooksCategoryPage.java     |  4 ++--
 .../category/MobileCompaniesCategoryPage.java |  4 ++--
 .../mobile/pages/category/MobileDocPage.java  |  4 ++--
 .../MobileLearnJavaFXCategoryPage.java        |  4 ++--
 .../MobileLearnMobileCategoryPage.java        |  4 ++--
 .../MobileLearnRaspberryPiCategoryPage.java   |  4 ++--
 .../category/MobileLibrariesCategoryPage.java |  4 ++--
 .../category/MobilePeopleCategoryPage.java    |  8 +++----
 .../category/MobileShowcasesCategoryPage.java |  4 ++--
 .../pages/category/MobileTipCategoryPage.java |  4 ++--
 .../category/MobileToolsCategoryPage.java     |  4 ++--
 .../category/MobileTutorialsCategoryPage.java |  4 ++--
 .../category/MobileVideosCategoryPage.java    |  4 ++--
 .../pages/details/MobileDetailsPageBase.java  |  4 ++--
 .../pages/details/MobileLearnDetailsPage.java | 14 ++++++------
 .../dlsc/jfxcentral2/demo/HelloTeamView.java  |  4 ++--
 .../demo/components/HelloDownloadsBox.java    |  4 ++--
 .../demo/components/HelloIkonGridView.java    |  4 ++--
 .../components/HelloIkonPackTileView.java     |  4 ++--
 .../demo/components/HelloLibraryTileView.java |  4 ++--
 .../demo/components/HelloPackGridView.java    |  4 ++--
 .../demo/components/HelloTopContentView.java  |  4 ++--
 .../devtools/HelloSVGPathExtractorView.java   |  4 ++--
 .../demo/mobile/HelloCategoryPreviewView.java | 10 ++++-----
 95 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java b/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java
index 2f950e25..161173fe 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.app;
 
 import com.dlsc.gemsfx.util.StageManager;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -328,7 +328,7 @@ private Response createResponse(Request request, Class<? extends ModelObject> cl
         int index = request.getPath().lastIndexOf("/");
         if (index > 0) {
             String id = request.getPath().substring(index + 1).trim();
-            if (!DataRepository2.getInstance().isValidId(clazz, id)) {
+            if (!DataRepository.getInstance().isValidId(clazz, id)) {
                 return Response.view(new ErrorPage(size, request));
             }
 
@@ -360,7 +360,7 @@ private Route createIconPackOrDetailRoute(String path) {
             String ikonliPackId = parts[1];
             String iconDescription = parts[2];
 
-            return DataRepository2.getInstance().getIkonliPackById(ikonliPackId)
+            return DataRepository.getInstance().getIkonliPackById(ikonliPackId)
                     .flatMap(ikonliPack -> IkonliPackUtil.getInstance().getIkon(ikonliPack, iconDescription)
                             .map(ikon -> {
                                 IconInfo iconInfo = new IconInfoBuilder(ikon, ikonliPack.getName(), ikonliPackId).build();
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2MobileApp.java b/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2MobileApp.java
index a4781c04..17f378a6 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2MobileApp.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2MobileApp.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -220,7 +220,7 @@ private MobileRoute createCategoryOrDetailRoute(String path, Class<? extends Mod
             int index = url.lastIndexOf("/");
             if (index > 0 && clazz != null) {
                 String id = url.substring(index + 1).trim();
-                if (!DataRepository2.getInstance().isValidId(clazz, id)) {
+                if (!DataRepository.getInstance().isValidId(clazz, id)) {
                     return MobileResponse.view(url, new Label("Error: 404"));
                 }
                 return MobileResponse.view(url, detailedResponse.call(id));
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/RepositoryManager.java b/app/src/main/java/com/dlsc/jfxcentral2/app/RepositoryManager.java
index 21c2e29e..2265d4e3 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/RepositoryManager.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/RepositoryManager.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral2.utils.LOGGER;
 import com.dlsc.jfxcentral2.utils.OSUtil;
 import javafx.application.Platform;
@@ -62,7 +62,7 @@ public static void updateRepository(ProgressMonitor monitor) {
     }
 
     private static File getRepositoryDirectory() {
-        return DataRepository2.getRepositoryDirectory();
+        return DataRepository.getInstance().getRepositoryDirectory();
     }
 
     public static boolean isFirstTimeSetup() {
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java b/app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java
index 48c368ed..4a9b7f69 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Documentation;
 import com.dlsc.jfxcentral.data.model.ModelObject;
 import com.dlsc.jfxcentral2.utils.LOGGER;
@@ -76,7 +76,7 @@ public void refresh() {
         Menu utilities = new Menu("Utilities");
         Menu documentation = new Menu("Documentation");
 
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
 
         repository.getTools().stream().sorted(Comparator.comparing(ModelObject::getName)).forEach(mo -> createMenuItem(tools, mo));
         repository.getPeople().stream().sorted(Comparator.comparing(ModelObject::getName)).forEach(mo -> createMenuItem(people, mo));
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/DetailsPageBase.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/DetailsPageBase.java
index 73444841..56a78154 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/DetailsPageBase.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/DetailsPageBase.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -51,7 +51,7 @@ public abstract class DetailsPageBase<T extends ModelObject> extends PageBase {
 
     public DetailsPageBase(ObjectProperty<Size> size, Class<? extends T> clazz, String itemId) {
         super(size, Mode.DARK);
-        setItem(DataRepository2.getInstance().getByID(clazz, itemId));
+        setItem(DataRepository.getInstance().getByID(clazz, itemId));
     }
 
     public T getItem() {
@@ -120,7 +120,7 @@ private <MO extends ModelObject> void maybeAddBox(ModelObject modelObject, Class
             return;
         }
 
-        List<MO> linkedObjects = DataRepository2.getInstance().getLinkedObjects(modelObject, clazz);
+        List<MO> linkedObjects = DataRepository.getInstance().getLinkedObjects(modelObject, clazz);
         if (!linkedObjects.isEmpty()) {
             DetailsBoxBase<MO> box = boxSupplier.get();
             box.getItems().setAll(linkedObjects);
@@ -130,9 +130,9 @@ private <MO extends ModelObject> void maybeAddBox(ModelObject modelObject, Class
     }
 
     private void addLearnBox(ModelObject modelObject, List<DetailsBoxBase<?>> boxList) {
-        List<LearnJavaFX> fxList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnJavaFX.class);
-        List<LearnMobile> mobileList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnMobile.class);
-        List<LearnRaspberryPi> learnRaspberryPiList = DataRepository2.getInstance().getLinkedObjects(modelObject, LearnRaspberryPi.class);
+        List<LearnJavaFX> fxList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnJavaFX.class);
+        List<LearnMobile> mobileList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnMobile.class);
+        List<LearnRaspberryPi> learnRaspberryPiList = DataRepository.getInstance().getLinkedObjects(modelObject, LearnRaspberryPi.class);
         if (!fxList.isEmpty() || !mobileList.isEmpty() || !learnRaspberryPiList.isEmpty()) {
             LearnDetailBox box = new LearnDetailBox();
             box.getItems().setAll(fxList);
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/LinksOfTheWeekPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/LinksOfTheWeekPage.java
index 8e24a1ed..2c52f810 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/LinksOfTheWeekPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/LinksOfTheWeekPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.components.DetailsContentPane;
 import com.dlsc.jfxcentral2.components.LinksOfTheWeekView;
@@ -67,7 +67,7 @@ public Node content() {
 
         // links of the week view
         LinksOfTheWeekView linksOfTheWeekView = new LinksOfTheWeekView();
-        linksOfTheWeekView.getLinksOfTheWeeks().setAll(DataRepository2.getInstance().getLinksOfTheWeek());
+        linksOfTheWeekView.getLinksOfTheWeeks().setAll(DataRepository.getInstance().getLinksOfTheWeek());
         linksOfTheWeekView.sizeProperty().bind(sizeProperty());
 
         // this is a category page, but we still need to use the details content pane for layout purposes
@@ -130,7 +130,7 @@ private HBox createPaginationBox(LinksOfTheWeekView linksOfTheWeekView) {
 
     @Override
     protected ObservableList<LinksOfTheWeek> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLinksOfTheWeek());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLinksOfTheWeek());
     }
 
     @Override
@@ -144,7 +144,7 @@ protected SearchFilterView<LinksOfTheWeek> createSearchFilterView() {
     }
 
     protected List<MenuView.Item> createMenuItems(LinksOfTheWeekView linksOfTheWeekView) {
-        List<LinksOfTheWeek> linksOfTheWeek = DataRepository2.getInstance().getLinksOfTheWeek();
+        List<LinksOfTheWeek> linksOfTheWeek = DataRepository.getInstance().getLinksOfTheWeek();
         List<LinksOfTheWeek> weeks = new ArrayList<>(linksOfTheWeek);
 
         return weeks
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java
index 99c9ffbb..1982fdb8 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.components.HomePageTopView;
 import com.dlsc.jfxcentral2.components.Mode;
@@ -38,7 +38,7 @@ public Node content() {
         homePageTopView.sizeProperty().bind(sizeProperty());
 
         // links of the Week
-        List<LinksOfTheWeek> linksOfTheWeek = DataRepository2.getInstance().getLinksOfTheWeek();
+        List<LinksOfTheWeek> linksOfTheWeek = DataRepository.getInstance().getLinksOfTheWeek();
 
         WeekLinksLiteView weekLinksLiteView = new WeekLinksLiteView();
         weekLinksLiteView.sizeProperty().bind(sizeProperty());
@@ -56,7 +56,7 @@ public Node content() {
         // video gallery
         VideoGalleryView videoGallery = new VideoGalleryView();
         videoGallery.sizeProperty().bind(sizeProperty());
-        videoGallery.getVideos().setAll(randomSubList(DataRepository2.getInstance().getVideos(), 12));
+        videoGallery.getVideos().setAll(randomSubList(DataRepository.getInstance().getVideos(), 12));
         videoGallery.blockingProperty().addListener(it -> setBlocking(videoGallery.isBlocking()));
         videoGallery.onCloseGlassPaneProperty().addListener(it -> setOnCloseGlassPane(videoGallery.getOnCloseGlassPane()));
         return wrapContent(homePageTopView, weekLinksLiteView, websiteChangesView, videoGallery);
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/TeamPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/TeamPage.java
index eeeea76c..d67bbb9e 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/TeamPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/TeamPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral2.components.FeaturesContainer;
 import com.dlsc.jfxcentral2.components.Mode;
 import com.dlsc.jfxcentral2.components.StripView;
@@ -39,7 +39,7 @@ public Node content() {
         // team view
         TeamView teamView = new TeamView();
         teamView.sizeProperty().bind(sizeProperty());
-        teamView.getMembers().setAll(DataRepository2.getInstance().getMembers());
+        teamView.getMembers().setAll(DataRepository.getInstance().getMembers());
 
         // features
         FeaturesContainer featuresContainer = new FeaturesContainer();
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BlogsCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BlogsCategoryPage.java
index 6dd0e94b..f1fd8130 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BlogsCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BlogsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.BlogsFilterView;
@@ -63,6 +63,6 @@ protected SearchFilterView<Blog> createSearchFilterView() {
 
     @Override
     protected ObservableList<Blog> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getBlogs());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getBlogs());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BooksCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BooksCategoryPage.java
index 3af83cda..b694ae0b 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BooksCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/BooksCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.BooksFilterView;
@@ -61,6 +61,6 @@ protected SearchFilterView<Book> createSearchFilterView() {
 
     @Override
     protected ObservableList<Book> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getBooks());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getBooks());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/CompaniesCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/CompaniesCategoryPage.java
index db9e9cc9..4a81a9fd 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/CompaniesCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/CompaniesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Company;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.CompaniesFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<Company> createSearchFilterView() {
 
     @Override
     protected ObservableList<Company> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getCompanies());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getCompanies());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DocumentationCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DocumentationCategoryPage.java
index 85877d2c..4900175b 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DocumentationCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DocumentationCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Documentation;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.DocumentationFilterView;
@@ -63,6 +63,6 @@ protected SearchFilterView<Documentation> createSearchFilterView() {
 
     @Override
     protected ObservableList<Documentation> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getDocumentation());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getDocumentation());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DownloadsCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DownloadsCategoryPage.java
index 22fcf903..d94ad357 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DownloadsCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/DownloadsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Download;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.DownloadsBox;
@@ -63,7 +63,7 @@ protected SearchFilterView<Download> createSearchFilterView() {
 
     @Override
     protected ObservableList<Download> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getDownloads());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getDownloads());
     }
 
     @Override
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnJavaFXCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnJavaFXCategoryPage.java
index 7430e3b7..06f3fe6a 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnJavaFXCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnJavaFXCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -35,7 +35,7 @@ protected String getCategoryDescription() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnJavaFX());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnJavaFX());
     }
 
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnMobileCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnMobileCategoryPage.java
index 541652c8..c758b9a9 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnMobileCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnMobileCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -36,6 +36,6 @@ protected String getCategoryDescription() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnMobile());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnMobile());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnRaspberryPiCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnRaspberryPiCategoryPage.java
index 0f9edb79..10b6fe88 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnRaspberryPiCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LearnRaspberryPiCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -36,6 +36,6 @@ protected String getCategoryDescription() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnRaspberryPi());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnRaspberryPi());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LibrariesCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LibrariesCategoryPage.java
index 9a2c11cd..d62963bf 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LibrariesCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/LibrariesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Library;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.LibrariesFilterView;
@@ -67,6 +67,6 @@ protected SearchFilterView<Library> createSearchFilterView() {
 
     @Override
     protected ObservableList<Library> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLibraries());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLibraries());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/PeopleCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/PeopleCategoryPage.java
index e5abec79..967c2258 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/PeopleCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/PeopleCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.PeopleFilterView;
@@ -77,6 +77,6 @@ protected SearchFilterView<Person> createSearchFilterView() {
 
     @Override
     protected ObservableList<Person> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getPeople());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getPeople());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ShowcasesCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ShowcasesCategoryPage.java
index 77c90f14..5fd45e14 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ShowcasesCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ShowcasesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<RealWorldApp> createSearchFilterView() {
 
     @Override
     protected ObservableList<RealWorldApp> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getRealWorldApps());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getRealWorldApps());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TipCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TipCategoryPage.java
index 31dfe73c..aeb3eabe 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TipCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TipCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tip;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<Tip> createSearchFilterView() {
 
     @Override
     protected ObservableList<Tip> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTips());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTips());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ToolsCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ToolsCategoryPage.java
index d9173d7a..8f8fc834 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ToolsCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/ToolsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tool;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -63,6 +63,6 @@ protected SearchFilterView<Tool> createSearchFilterView() {
 
     @Override
     protected ObservableList<Tool> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTools());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTools());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TutorialsCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TutorialsCategoryPage.java
index 4d697cb5..89fb6ff0 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TutorialsCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/TutorialsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tutorial;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -58,6 +58,6 @@ protected SearchFilterView<Tutorial> createSearchFilterView() {
 
     @Override
     protected ObservableList<Tutorial> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTutorials());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTutorials());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/UtilitiesCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/UtilitiesCategoryPage.java
index 8a11a198..c8fb85e4 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/UtilitiesCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/UtilitiesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Utility;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -66,7 +66,7 @@ protected SearchFilterView<Utility> createSearchFilterView() {
 
     @Override
     protected ObservableList<Utility> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getUtilities())
+        return FXCollections.observableArrayList(DataRepository.getInstance().getUtilities())
                 .sorted((o1, o2) -> Boolean.compare(o2.isOnlineSupported(), o1.isOnlineSupported()));
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/VideosCategoryPage.java b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/VideosCategoryPage.java
index d6294575..c3790abe 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/VideosCategoryPage.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/pages/category/VideosCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Video;
 import com.dlsc.jfxcentral2.app.pages.CategoryPageBase;
 import com.dlsc.jfxcentral2.components.filters.SearchFilterView;
@@ -69,6 +69,6 @@ protected Callback<Video, TileViewBase<Video>> getTileViewProvider() {
 
     @Override
     protected ObservableList<Video> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getVideos());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getVideos());
     }
 }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/service/LoadPullRequestsService.java b/app/src/main/java/com/dlsc/jfxcentral2/app/service/LoadPullRequestsService.java
index 66164c81..b6ec5857 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/service/LoadPullRequestsService.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/service/LoadPullRequestsService.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.service;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.pull.PullRequest;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
@@ -14,7 +14,7 @@ protected Task<List<PullRequest>> createTask() {
         return new Task<>() {
             @Override
             protected List<PullRequest> call() {
-                List<PullRequest> pullRequests = DataRepository2.getInstance().loadPullRequests();
+                List<PullRequest> pullRequests = DataRepository.getInstance().loadPullRequests();
                 updateProgress(1, 1);
                 return pullRequests;
             }
diff --git a/app/src/main/java/com/dlsc/jfxcentral2/app/utils/RepositoryUpdater.java b/app/src/main/java/com/dlsc/jfxcentral2/app/utils/RepositoryUpdater.java
index d24c381e..f3acf962 100644
--- a/app/src/main/java/com/dlsc/jfxcentral2/app/utils/RepositoryUpdater.java
+++ b/app/src/main/java/com/dlsc/jfxcentral2/app/utils/RepositoryUpdater.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.app.utils;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral2.app.RepositoryManager;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyIntegerProperty;
@@ -63,7 +63,7 @@ public void update(int completed) {
             @Override
             public void endTask() {
                 if (refresh) {
-                    DataRepository2.getInstance().reload();
+                    DataRepository.getInstance().reload();
                 }
             }
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/FeaturesContainer.java b/components/src/main/java/com/dlsc/jfxcentral2/components/FeaturesContainer.java
index 9be53ab8..69754f15 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/FeaturesContainer.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/FeaturesContainer.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Library;
@@ -61,21 +61,21 @@ public FeaturesContainer(Orientation orientation) {
         featuresProperty().addListener((ob, ov, nv) -> layoutBySize());
 
         List<ModelObject> allModelObjects = new ArrayList<>();
-        allModelObjects.addAll(DataRepository2.getInstance().getTips());
-        allModelObjects.addAll(DataRepository2.getInstance().getLibraries());
-        allModelObjects.addAll(DataRepository2.getInstance().getRealWorldApps());
-        allModelObjects.addAll(DataRepository2.getInstance().getTools());
-        allModelObjects.addAll(DataRepository2.getInstance().getBooks());
-        allModelObjects.addAll(DataRepository2.getInstance().getBlogs());
+        allModelObjects.addAll(DataRepository.getInstance().getTips());
+        allModelObjects.addAll(DataRepository.getInstance().getLibraries());
+        allModelObjects.addAll(DataRepository.getInstance().getRealWorldApps());
+        allModelObjects.addAll(DataRepository.getInstance().getTools());
+        allModelObjects.addAll(DataRepository.getInstance().getBooks());
+        allModelObjects.addAll(DataRepository.getInstance().getBlogs());
         Collections.shuffle(allModelObjects);
 
         /*
          * For now we do not feature videos, tutorials, people, or blogs.
          */
-//        allModelObjects.addAll(DataRepository2.getInstance().getVideos());
-//        allModelObjects.addAll(DataRepository2.getInstance().getTutorials());
-//        allModelObjects.addAll(DataRepository2.getInstance().getPeople());
-//        allModelObjects.addAll(DataRepository2.getInstance().getBlogs());
+//        allModelObjects.addAll(DataRepository.getInstance().getVideos());
+//        allModelObjects.addAll(DataRepository.getInstance().getTutorials());
+//        allModelObjects.addAll(DataRepository.getInstance().getPeople());
+//        allModelObjects.addAll(DataRepository.getInstance().getBlogs());
 
 
         allModelObjects
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/LearnPaginationBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/LearnPaginationBox.java
index 4ebef6a3..9657873c 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/LearnPaginationBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/LearnPaginationBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral.data.model.LearnJavaFX;
 import com.dlsc.jfxcentral.data.model.LearnMobile;
@@ -28,11 +28,11 @@ public LearnPaginationBox(Learn learn, Position position, ObjectProperty<Size> s
 
         List<? extends Learn> learnList;
         if (learn instanceof LearnJavaFX) {
-            learnList = DataRepository2.getInstance().getLearnJavaFX();
+            learnList = DataRepository.getInstance().getLearnJavaFX();
         } else if (learn instanceof LearnMobile) {
-            learnList = DataRepository2.getInstance().getLearnMobile();
+            learnList = DataRepository.getInstance().getLearnMobile();
         } else {
-            learnList = DataRepository2.getInstance().getLearnRaspberryPi();
+            learnList = DataRepository.getInstance().getLearnRaspberryPi();
         }
 
         Button previousButton = new Button();
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/LibraryPreviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/LibraryPreviewBox.java
index 83b4524b..2f58860e 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/LibraryPreviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/LibraryPreviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Image;
 import com.dlsc.jfxcentral.data.model.Library;
@@ -39,7 +39,7 @@ public class LibraryPreviewBox extends PaneBase {
     public LibraryPreviewBox(Library library) {
         this.library = Objects.requireNonNull(library);
         getStyleClass().add("library-preview-box");
-        setLibraryInfo(DataRepository2.getInstance().getLibraryInfo(library));
+        setLibraryInfo(DataRepository.getInstance().getLibraryInfo(library));
         layoutBySize();
     }
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/LinksOfTheWeekView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/LinksOfTheWeekView.java
index 67ee135a..b20fff4c 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/LinksOfTheWeekView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/LinksOfTheWeekView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.model.Size;
 import com.dlsc.jfxcentral2.utils.NodeUtil;
@@ -103,7 +103,7 @@ private void createFactory() {
                 dateLabel.setText(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(week.getCreatedOn()));
 
                 CustomMarkdownView markdownView = new CustomMarkdownView();
-                markdownView.setMdString(DataRepository2.getInstance().getLinksOfTheWeekReadMe(week));
+                markdownView.setMdString(DataRepository.getInstance().getLinksOfTheWeekReadMe(week));
                 markdownView.setPrefHeight(markdownView.getWidth());
 
                 VBox weekBox = new VBox(markdownView);
@@ -127,7 +127,7 @@ private void createFactory() {
     }
 
     protected List<LinksOfTheWeek> getSortedList() {
-        return DataRepository2.getInstance().getLinksOfTheWeek()
+        return DataRepository.getInstance().getLinksOfTheWeek()
                 .stream()
                 .sorted(Comparator.comparing(LinksOfTheWeek::getCreatedOn).reversed())
                 .toList();
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/MemberCellView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/MemberCellView.java
index 95e3703a..30bb9556 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/MemberCellView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/MemberCellView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Member;
 import javafx.geometry.Pos;
@@ -28,7 +28,7 @@ public MemberCellView(Member member) {
         jobTitleLabel.setText(member.getJobTitle());
 
         descriptionMd = new CustomMarkdownView();
-        descriptionMd.setMdString(DataRepository2.getInstance().getMemberReadMe(member));
+        descriptionMd.setMdString(DataRepository.getInstance().getMemberReadMe(member));
 
         socialLinksView = new SocialLinksView(true);
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/PacksIconsView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/PacksIconsView.java
index 5b1e9cd7..8f336aec 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/PacksIconsView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/PacksIconsView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.IkonliPack;
 import com.dlsc.jfxcentral2.components.gridview.IkonGridView;
 import com.dlsc.jfxcentral2.components.gridview.ModelGridView;
@@ -203,7 +203,7 @@ private ModelGridView<IkonliPack> createModelGridView(ComboBox<Sort> sortComboBo
         packGridView.managedProperty().bind(visibleProperty());
 
         // packs data
-        ObservableList<IkonliPack> packs = FXCollections.observableArrayList(DataRepository2.getInstance().getIkonliPacks());
+        ObservableList<IkonliPack> packs = FXCollections.observableArrayList(DataRepository.getInstance().getIkonliPacks());
         FilteredList<IkonliPack> filteredPacks = new FilteredList<>(packs);
         filteredPacks.predicateProperty().bind(Bindings.createObjectBinding(() -> {
             String text = searchText.get().trim();
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/TopMenuBar.java b/components/src/main/java/com/dlsc/jfxcentral2/components/TopMenuBar.java
index 0fe54268..42348c55 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/TopMenuBar.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/TopMenuBar.java
@@ -2,7 +2,7 @@
 
 import com.dlsc.gemsfx.SearchField;
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -146,7 +146,7 @@ private SessionManager getSessionManager() {
     }
 
     public List<ModelObject> search(String pattern) {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
 
         List<ModelObject> results = new ArrayList<>();
         search(repository.getBooks(), pattern, results);
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/WeekLinksLiteView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/WeekLinksLiteView.java
index 60a58649..08a25ba0 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/WeekLinksLiteView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/WeekLinksLiteView.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.components;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -49,7 +49,7 @@ public WeekLinksLiteView() {
             }
             DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL);
             String date = String.format("## Posted on %s%n%n", formatter.format(linksOfTheWeek.getCreatedOn()));
-            String mdStr = DataRepository2.getInstance().getLinksOfTheWeekReadMe(linksOfTheWeek);
+            String mdStr = DataRepository.getInstance().getLinksOfTheWeekReadMe(linksOfTheWeek);
             return date + mdStr;
         }, linksOfTheWeekProperty()));
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DetailsBoxBase.java b/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DetailsBoxBase.java
index f3bdad32..36f0588d 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DetailsBoxBase.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DetailsBoxBase.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.components.detailsbox;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Download;
 import com.dlsc.jfxcentral.data.model.Library;
@@ -171,9 +171,9 @@ protected String getDescription(T model) {
 
         // some model objects have a more suitable description (currently) in their readme files
         if (model instanceof Download download) {
-            return DataRepository2.getInstance().getDownloadReadMe(download);
+            return DataRepository.getInstance().getDownloadReadMe(download);
         } else if (model instanceof Person person) {
-            return DataRepository2.getInstance().getPersonReadMe(person);
+            return DataRepository.getInstance().getPersonReadMe(person);
         }
 
         return "(Missing description)";
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryCoordinatesBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryCoordinatesBox.java
index a1d18c68..7f0a95c8 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryCoordinatesBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryCoordinatesBox.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.components.detailsbox;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Coordinates;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 import com.dlsc.jfxcentral2.components.Header;
@@ -48,7 +48,7 @@ public LibraryCoordinatesBox(Coordinates coordinates) {
         StringProperty versionProperty = new SimpleStringProperty(this, "version");
 
         if (isAvailable) {
-            FXFuture.runBackground(() -> DataRepository2.getInstance().getArtifactVersion(coordinates)).map(property -> {
+            FXFuture.runBackground(() -> DataRepository.getInstance().getArtifactVersion(coordinates)).map(property -> {
                 versionProperty.bind(property);
                 return null;
             });
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/DocumentationFilterView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/DocumentationFilterView.java
index a3166134..f82f487e 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/DocumentationFilterView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/DocumentationFilterView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.filters;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Documentation;
 import org.apache.commons.lang3.StringUtils;
 
@@ -49,7 +49,7 @@ private BiPredicate<Documentation, String> createFilterPredicate(Function<Docume
     private List<FilterItem<Documentation>> getVideoFilterItems(
             Function<Documentation, String> attrGetter,
             BiPredicate<Documentation, String> predicate) {
-        List<Documentation> appList = DataRepository2.getInstance().getDocumentation();
+        List<Documentation> appList = DataRepository.getInstance().getDocumentation();
 
         ArrayList<FilterItem<Documentation>> filterItems = new ArrayList<>(appList.stream()
                 .flatMap(app -> Optional.ofNullable(attrGetter.apply(app)).stream()
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/LearnFilterView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/LearnFilterView.java
index 2bd4e612..7d73bbc5 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/LearnFilterView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/LearnFilterView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.filters;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral.data.model.LearnJavaFX;
 import com.dlsc.jfxcentral.data.model.LearnMobile;
@@ -24,13 +24,13 @@ public LearnFilterView() {
         setSortGroup(new SortGroup<>("ORDER", List.of(
                 new SortItem<>("Natural Order", Comparator.comparing((Learn modelObject) -> {
                     if (modelObject instanceof LearnJavaFX fxmodel) {
-                        List<LearnJavaFX> fxList = DataRepository2.getInstance().getLearnJavaFX();
+                        List<LearnJavaFX> fxList = DataRepository.getInstance().getLearnJavaFX();
                         return fxList.indexOf(fxmodel);
                     } else if (modelObject instanceof LearnMobile mobile) {
-                        List<LearnMobile> mobileList = DataRepository2.getInstance().getLearnMobile();
+                        List<LearnMobile> mobileList = DataRepository.getInstance().getLearnMobile();
                         return mobileList.indexOf(mobile);
                     } else if (modelObject instanceof LearnRaspberryPi pi) {
-                        List<LearnRaspberryPi> piList = DataRepository2.getInstance().getLearnRaspberryPi();
+                        List<LearnRaspberryPi> piList = DataRepository.getInstance().getLearnRaspberryPi();
                         return piList.indexOf(pi);
                     }
                     return 0;
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/ShowcaseFilterView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/ShowcaseFilterView.java
index 2b4e5feb..4673bcea 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/ShowcaseFilterView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/ShowcaseFilterView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.filters;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
 import org.apache.commons.lang3.StringUtils;
 
@@ -32,7 +32,7 @@ public ShowcaseFilterView() {
     }
 
     private List<FilterItem<RealWorldApp>> getDomainFilterItems() {
-        List<RealWorldApp> appList = DataRepository2.getInstance().getRealWorldApps();
+        List<RealWorldApp> appList = DataRepository.getInstance().getRealWorldApps();
 
         ArrayList<FilterItem<RealWorldApp>> filterItems = new ArrayList<>(appList.stream()
                 .flatMap(app -> Optional.ofNullable(app.getDomain()).stream()
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/VideosFilterView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/VideosFilterView.java
index 10fa90b3..4914ef32 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/filters/VideosFilterView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/filters/VideosFilterView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.filters;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Video;
 import org.apache.commons.lang3.StringUtils;
 
@@ -57,7 +57,7 @@ private BiPredicate<Video, String> createFilterPredicate(Function<Video, String>
     private List<FilterItem<Video>> getVideoFilterItems(
             Function<Video, String> attrGetter,
             BiPredicate<Video, String> predicate) {
-        List<Video> appList = DataRepository2.getInstance().getVideos();
+        List<Video> appList = DataRepository.getInstance().getVideos();
 
         ArrayList<FilterItem<Video>> filterItems = new ArrayList<>(appList.stream()
                 .flatMap(app -> Optional.ofNullable(attrGetter.apply(app)).stream()
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/headers/PersonDetailHeader.java b/components/src/main/java/com/dlsc/jfxcentral2/components/headers/PersonDetailHeader.java
index 5a736ac3..6251dc84 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/headers/PersonDetailHeader.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/headers/PersonDetailHeader.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.headers;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral2.components.AvatarView;
@@ -45,7 +45,7 @@ private Pane createCenterNode() {
         FlowPane nameBadgePane = createNameBadgePane(person);
 
         Label descriptionLabel = new Label();
-        descriptionLabel.setText(DataRepository2.getInstance().getPersonReadMe(person));
+        descriptionLabel.setText(DataRepository.getInstance().getPersonReadMe(person));
         descriptionLabel.setWrapText(true);
         descriptionLabel.getStyleClass().add("description");
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BlogOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BlogOverviewBox.java
index 5051ceb7..45bb39eb 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BlogOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BlogOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Post;
@@ -55,7 +55,7 @@ protected Task<Void> createTask() {
                 return new Task<>() {
                     @Override
                     protected Void call() throws InterruptedException {
-                        List<Post> posts = DataRepository2.getInstance().loadPosts(getModel());
+                        List<Post> posts = DataRepository.getInstance().loadPosts(getModel());
                         Thread.sleep(500);
                         Platform.runLater(() -> {
                             box.getChildren().clear();
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BookOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BookOverviewBox.java
index f7ad60a2..29e94e58 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BookOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/BookOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral2.components.CustomImageView;
@@ -21,8 +21,8 @@ public class BookOverviewBox extends OverviewBox<Book> {
     public BookOverviewBox(Book book) {
         super(book);
         getStyleClass().add("book-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "books/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getBookReadMe(book));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "books/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getBookReadMe(book));
     }
 
     @Override
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/CompanyOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/CompanyOverviewBox.java
index f9536782..445b8264 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/CompanyOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/CompanyOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Company;
 
 public class CompanyOverviewBox extends SimpleOverviewBox<Company> {
@@ -8,7 +8,7 @@ public class CompanyOverviewBox extends SimpleOverviewBox<Company> {
     public CompanyOverviewBox(Company company) {
         super(company);
         getStyleClass().add("company-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "companies/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getCompanyReadMe(company));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "companies/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getCompanyReadMe(company));
     }
 }
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/DownloadOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/DownloadOverviewBox.java
index fc12d630..70517d10 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/DownloadOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/DownloadOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Download;
 
 /*
@@ -11,7 +11,7 @@ public class DownloadOverviewBox extends SimpleOverviewBox<Download> {
     public DownloadOverviewBox(Download download) {
         super(download);
         getStyleClass().add("download-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "downloads/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getDownloadReadMe(download));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "downloads/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getDownloadReadMe(download));
     }
 }
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LearnOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LearnOverviewBox.java
index 05466dd3..376ce3b5 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LearnOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LearnOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral.data.model.LearnJavaFX;
 import com.dlsc.jfxcentral.data.model.LearnMobile;
@@ -15,14 +15,14 @@ public LearnOverviewBox(Learn learn) {
         getStyleClass().add("learn-overview-box");
 
         if (learn instanceof LearnJavaFX temp) {
-            setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/javafx/" + learn.getId());
-            setMarkdown(DataRepository2.getInstance().getLearnJavaFXReadMe(temp));
+            setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/javafx/" + learn.getId());
+            setMarkdown(DataRepository.getInstance().getLearnJavaFXReadMe(temp));
         } else if (learn instanceof LearnMobile temp) {
-            setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/mobile/" + learn.getId());
-            setMarkdown(DataRepository2.getInstance().getLearnMobileReadMe(temp));
+            setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/mobile/" + learn.getId());
+            setMarkdown(DataRepository.getInstance().getLearnMobileReadMe(temp));
         } else {
-            setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/raspberrypi/" + learn.getId());
-            setMarkdown(DataRepository2.getInstance().getLearnRaspberryPiReadMe((LearnRaspberryPi) learn));
+            setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/raspberrypi/" + learn.getId());
+            setMarkdown(DataRepository.getInstance().getLearnRaspberryPiReadMe((LearnRaspberryPi) learn));
         }
     }
 
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LibraryOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LibraryOverviewBox.java
index b5319364..6cf10cfa 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LibraryOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/LibraryOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Library;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 import com.dlsc.jfxcentral2.components.Header;
@@ -28,8 +28,8 @@ public LibraryOverviewBox(Library library) {
         header.visibleProperty().bind(titleProperty().isNotEmpty().and(iconProperty().isNotNull()));
 
         CustomMarkdownView markdownView = new CustomMarkdownView();
-        markdownView.setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "libraries/" + library.getId());
-        markdownView.setMdString(DataRepository2.getInstance().getLibraryReadMe(library));
+        markdownView.setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "libraries/" + library.getId());
+        markdownView.setMdString(DataRepository.getInstance().getLibraryReadMe(library));
 
         LibraryPreviewBox libraryPreviewBox = new LibraryPreviewBox(library);
         libraryPreviewBox.sizeProperty().bind(sizeProperty());
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ShowcaseOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ShowcaseOverviewBox.java
index 1d470e3a..d41979be 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ShowcaseOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ShowcaseOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
 import com.dlsc.jfxcentral2.utils.OSUtil;
 import javafx.geometry.HPos;
@@ -45,7 +45,7 @@ protected Node createTopNode() {
         FieldGroup createdOnGroup = new FieldGroup("CREATED ON", new String[]{"field-value"});
         createdOnLabel = createdOnGroup.getLabel();
 
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "realworld/" + getModel().getId());
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "realworld/" + getModel().getId());
         fillData();
 
         if (!isSmall()) {
@@ -107,7 +107,7 @@ private void fillData() {
             if (app.getCreationOrUpdateDate() != null) {
                 createdOnLabel.setText(app.getCreationOrUpdateDate().format(DEFAULT_DATE_FORMATTER));
             }
-            setMarkdown(DataRepository2.getInstance().getRealWorldReadMe(app));
+            setMarkdown(DataRepository.getInstance().getRealWorldReadMe(app));
         } else {
             locationLabel.setText("");
             domainLabel.setText("");
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TipOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TipOverviewBox.java
index 68f1f52d..c5cdc9d2 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TipOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TipOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tip;
 
 public class TipOverviewBox extends OverviewBox<Tip> {
@@ -8,7 +8,7 @@ public class TipOverviewBox extends OverviewBox<Tip> {
     public TipOverviewBox(Tip tip) {
         super(tip);
         getStyleClass().add("tip-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "tips/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getTipReadMe(tip));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "tips/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getTipReadMe(tip));
     }
 }
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ToolOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ToolOverviewBox.java
index 56705956..5a5c18b3 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ToolOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/ToolOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tool;
 
 public class ToolOverviewBox extends SimpleOverviewBox<Tool> {
@@ -8,7 +8,7 @@ public class ToolOverviewBox extends SimpleOverviewBox<Tool> {
     public ToolOverviewBox(Tool tool) {
         super(tool);
         getStyleClass().add("tool-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "tools/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getToolReadMe(tool));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "tools/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getToolReadMe(tool));
     }
 }
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TutorialOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TutorialOverviewBox.java
index 3747161c..ba3d33d5 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TutorialOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/TutorialOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Tutorial;
 
@@ -9,8 +9,8 @@ public class TutorialOverviewBox extends SimpleOverviewBox<Tutorial> {
     public TutorialOverviewBox(Tutorial tutorial) {
         super(tutorial);
         getStyleClass().add("tutorial-overview-box");
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "tutorials/" + getModel().getId());
-        setMarkdown(DataRepository2.getInstance().getTutorialReadMe(tutorial));
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "tutorials/" + getModel().getId());
+        setMarkdown(DataRepository.getInstance().getTutorialReadMe(tutorial));
         imageProperty().bind(ImageManager.getInstance().tutorialImageLargeProperty(tutorial));
     }
 }
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/UtilityOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/UtilityOverviewBox.java
index c7b8227f..28252a9d 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/UtilityOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/UtilityOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Utility;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 import com.dlsc.jfxcentral2.iconfont.JFXCentralIcon;
@@ -104,7 +104,7 @@ private Node createToolPane(Utility model) {
     }
 
     private Node readmeView(Utility model) {
-        String readme = DataRepository2.getInstance().getUtilityReadMe(model);
+        String readme = DataRepository.getInstance().getUtilityReadMe(model);
         CustomMarkdownView markdownView = new CustomMarkdownView(readme);
         markdownView.setDisable(!ModelObjectTool.isUtilityCanBeUsed(model));
         return markdownView;
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/VideoOverviewBox.java b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/VideoOverviewBox.java
index a738eeff..6222e87c 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/VideoOverviewBox.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/overviewbox/VideoOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.overviewbox;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Video;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 import com.dlsc.jfxcentral2.utils.VideoViewFactory;
@@ -15,7 +15,7 @@ public VideoOverviewBox(Video video) {
 
         // there is no markdown for videos, but we might add it in the future,
         // so let's specify the base url ... just to be sure
-        setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "videos/" + video.getId());
+        setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "videos/" + video.getId());
     }
 
     @Override
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/LearnTileView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/LearnTileView.java
index 77014bd5..00e4ec2e 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/LearnTileView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/LearnTileView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.tiles;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.components.AvatarView;
@@ -33,7 +33,7 @@ protected void updateLinkedObjectBadges() {
         HBox developmentStatusBox = getLinkedObjectBox();
         developmentStatusBox.getChildren().clear();
         Learn learn = getData();
-        learn.getPersonIds().forEach(id -> DataRepository2.getInstance().getPersonById(id)
+        learn.getPersonIds().forEach(id -> DataRepository.getInstance().getPersonById(id)
                 .ifPresent(person -> {
                     AvatarView avatarView = new AvatarView();
                     avatarView.setTooltip(new Tooltip(person.getName()));
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/PersonTileView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/PersonTileView.java
index 724761f8..a5a1a807 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/PersonTileView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/PersonTileView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.tiles;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral2.components.SocialLinksView;
@@ -34,7 +34,7 @@ public PersonTileView(Person person) {
         imageProperty().bind(ImageManager.getInstance().personImageProperty(person));
 
         setTitle(person.getName());
-        setDescription(DataRepository2.getInstance().getPersonReadMe(person));
+        setDescription(DataRepository.getInstance().getPersonReadMe(person));
 
         //add badges
         badgeBox.getChildren().clear();
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/SimpleTileView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/SimpleTileView.java
index 3b606cbd..fb07dcf5 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/SimpleTileView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/tiles/SimpleTileView.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.components.tiles;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Documentation;
 import com.dlsc.jfxcentral.data.model.Download;
@@ -174,7 +174,7 @@ protected void updateLinkedObjectBadges() {
             return;
         }
 
-        DataRepository2 dataRepository = DataRepository2.getInstance();
+        DataRepository dataRepository = DataRepository.getInstance();
         List<LinkedObjectBadge> linkedObjectBadge = List.of(
                 new LinkedObjectBadge("Books", IkonUtil.getModelIkon(Book.class), dataRepository.getLinkedObjects(data, Book.class).size()),
                 new LinkedObjectBadge("Apps", IkonUtil.getModelIkon(RealWorldApp.class), dataRepository.getLinkedObjects(data, RealWorldApp.class).size()),
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/components/topcontent/TopContentContainerView.java b/components/src/main/java/com/dlsc/jfxcentral2/components/topcontent/TopContentContainerView.java
index 7654dd65..993e1fc7 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/components/topcontent/TopContentContainerView.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/components/topcontent/TopContentContainerView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.components.topcontent;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -80,14 +80,14 @@ protected Task<Void> createTask() {
                 return new Task<>() {
                     @Override
                     protected Void call() throws Exception {
-                        List<Tool> tools = DataRepository2.getInstance().getTools();
-                        List<Library> libraries = DataRepository2.getInstance().getLibraries();
-                        List<Blog> blogs = DataRepository2.getInstance().getBlogs();
-                        List<Video> videos = DataRepository2.getInstance().getVideos();
-                        List<Download> downloads = DataRepository2.getInstance().getDownloads();
-                        List<Book> books = DataRepository2.getInstance().getBooks();
-                        List<Company> companies = DataRepository2.getInstance().getCompanies();
-                        List<Tip> tips = DataRepository2.getInstance().getTips();
+                        List<Tool> tools = DataRepository.getInstance().getTools();
+                        List<Library> libraries = DataRepository.getInstance().getLibraries();
+                        List<Blog> blogs = DataRepository.getInstance().getBlogs();
+                        List<Video> videos = DataRepository.getInstance().getVideos();
+                        List<Download> downloads = DataRepository.getInstance().getDownloads();
+                        List<Book> books = DataRepository.getInstance().getBooks();
+                        List<Company> companies = DataRepository.getInstance().getCompanies();
+                        List<Tip> tips = DataRepository.getInstance().getTips();
                         //Display the interface, Pause for 0.5 seconds, then fill the data
                         Thread.sleep(500);
                         Platform.runLater(() -> {
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/utils/IkonliPackUtil.java b/components/src/main/java/com/dlsc/jfxcentral2/utils/IkonliPackUtil.java
index 1edc0687..81b7f3ea 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/utils/IkonliPackUtil.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/utils/IkonliPackUtil.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.utils;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Dependency;
 import com.dlsc.jfxcentral.data.model.IkonliPack;
 import com.dlsc.jfxcentral2.model.IkonData;
@@ -36,7 +36,7 @@ private IkonliPackUtil() {
                 ikonDataSet.add(IkonData.of(provider));
             }
         }
-        List<IkonliPack> ikonliPacks = DataRepository2.getInstance().getIkonliPacks();
+        List<IkonliPack> ikonliPacks = DataRepository.getInstance().getIkonliPacks();
 
         ikonDataSet.forEach(data -> {
             for (IkonliPack pack : ikonliPacks) {
diff --git a/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java b/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java
index 7904b488..08de3aca 100644
--- a/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java
+++ b/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.utils;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Download;
 import com.dlsc.jfxcentral.data.model.Library;
@@ -163,7 +163,7 @@ public static boolean checkArrayList(List<QuickLink> list) {
     }
 
     private static List<ModelObject> createShuffledSublist(int size) {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
 
         List<ModelObject> allModelObjects = new ArrayList<>();
         allModelObjects.addAll(repository.getTips());
@@ -222,7 +222,7 @@ public static List<QuickLink> generateWebsiteChangesQuickLinks(ObjectProperty<Si
     }
 
     private static List<ModelObject> findRecentItems() {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
 
         List<ModelObject> result = new ArrayList<>();
 
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnListCell.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnListCell.java
index 9465e8b6..2f9f02e4 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnListCell.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnListCell.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.components.AvatarView;
@@ -43,7 +43,7 @@ protected void updateItem(Learn item, boolean empty) {
             setGraphic(null);
         } else {
             titleLabel.setText(item.getName());
-            item.getPersonIds().forEach(id -> DataRepository2.getInstance().getPersonById(id)
+            item.getPersonIds().forEach(id -> DataRepository.getInstance().getPersonById(id)
                     .ifPresent(person -> {
                         AvatarView avatarView = new AvatarView();
                         avatarView.setTooltip(new Tooltip(person.getName()));
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnPagination.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnPagination.java
index 130b8595..2a01e937 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnPagination.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LearnPagination.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral.data.model.LearnJavaFX;
@@ -45,7 +45,7 @@ public LearnPagination() {
         itemProperty().addListener((obs, oldItem, newItem) -> {
             // update author box
             authorBox.getChildren().clear();
-            newItem.getPersonIds().forEach(id -> DataRepository2.getInstance().getPersonById(id)
+            newItem.getPersonIds().forEach(id -> DataRepository.getInstance().getPersonById(id)
                     .ifPresent(person -> {
                         AvatarView avatarView = new AvatarView();
                         avatarView.setTooltip(new Tooltip(person.getName()));
@@ -65,11 +65,11 @@ public LearnPagination() {
             }
 
             if (currentItem instanceof LearnJavaFX data) {
-                return DataRepository2.getInstance().getLearnJavaFXReadMe(data);
+                return DataRepository.getInstance().getLearnJavaFXReadMe(data);
             } else if (currentItem instanceof LearnMobile data) {
-                return DataRepository2.getInstance().getLearnMobileReadMe(data);
+                return DataRepository.getInstance().getLearnMobileReadMe(data);
             } else if (currentItem instanceof LearnRaspberryPi data) {
-                return DataRepository2.getInstance().getLearnRaspberryPiReadMe(data);
+                return DataRepository.getInstance().getLearnRaspberryPiReadMe(data);
             }
             return "";
         }, itemProperty(), baseURLProperty()));
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LinkedObjectsBox.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LinkedObjectsBox.java
index a561720f..bb711ad9 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LinkedObjectsBox.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LinkedObjectsBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Company;
@@ -135,7 +135,7 @@ private void updateView() {
     }
 
     private <M extends ModelObject> List<M> getLinkedObjects(T t, Class<M> type) {
-        return DataRepository2.getInstance().getLinkedObjects(t, type);
+        return DataRepository.getInstance().getLinkedObjects(t, type);
     }
 
     // size
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LotwPagination.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LotwPagination.java
index 12eb5b52..a3681da1 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LotwPagination.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/LotwPagination.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 
@@ -21,7 +21,7 @@ public LotwPagination() {
             if (lotw == null) {
                 return "";
             }
-            return DataRepository2.getInstance().getLinksOfTheWeekReadMe(lotw);
+            return DataRepository.getInstance().getLinksOfTheWeekReadMe(lotw);
         }, itemProperty()));
 
         scrollPane.setContent(markdownView);
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileBlogOverviewBox.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileBlogOverviewBox.java
index 4bad0b23..3d5ceda5 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileBlogOverviewBox.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileBlogOverviewBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Post;
 import com.dlsc.jfxcentral2.components.Header;
@@ -72,7 +72,7 @@ protected Task<Void> createTask() {
                 return new Task<>() {
                     @Override
                     protected Void call() throws InterruptedException {
-                        List<Post> posts = DataRepository2.getInstance().loadPosts(blog);
+                        List<Post> posts = DataRepository.getInstance().loadPosts(blog);
                         posts.sort((o1, o2) -> o2.getSyndEntry().getPublishedDate().compareTo(o1.getSyndEntry().getPublishedDate()));
                         Thread.sleep(500);
                         Platform.runLater(() -> {
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobilePersonDetailView.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobilePersonDetailView.java
index 63989187..2a767ecb 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobilePersonDetailView.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobilePersonDetailView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral2.components.AvatarView;
@@ -88,7 +88,7 @@ private void updateView() {
 
         // reset the text
         nameLabel.setText(person.getName());
-        descriptionLabel.setText(DataRepository2.getInstance().getPersonReadMe(person));
+        descriptionLabel.setText(DataRepository.getInstance().getPersonReadMe(person));
 
         // reset the boxes
         updateBadge(person);
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileSearchView.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileSearchView.java
index cf9f12c0..b69e92fa 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileSearchView.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/components/MobileSearchView.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.mobile.components;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.ModelObject;
 import com.dlsc.jfxcentral2.components.SearchResultCell;
 import com.dlsc.jfxcentral2.components.SizeSupport;
@@ -74,7 +74,7 @@ public MobileSearchView(ObjectProperty<Size> size) {
     }
 
     private void addSuggestionsToList() {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.getPeople().forEach(person -> searchSuggestions.add(person.getName()));
     }
 
@@ -165,7 +165,7 @@ public final void setSize(Size size) {
     }
 
     public void addModelsToCollection() {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         totalResources.addAll(repository.getBooks());
         totalResources.addAll(repository.getBlogs());
         totalResources.addAll(repository.getCompanies());
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/CategoryPreviewView.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/CategoryPreviewView.java
index 1870c8b7..dea70bc1 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/CategoryPreviewView.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/CategoryPreviewView.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.mobile.home;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
@@ -523,7 +523,7 @@ public static CategoryPreviewView createPeoplePreviewView(List<Person> people, S
         for (Person person : people) {
             CategoryPreviewView.CategoryItem item = new CategoryPreviewView.CategoryItem(
                     person.getName(),
-                    DataRepository2.getInstance().getPersonReadMe(person),
+                    DataRepository.getInstance().getPersonReadMe(person),
                     ImageManager.getInstance().personImageProperty(person),
                     ModelObjectTool.getModelLink(person)
             );
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/WeekLinksView.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/WeekLinksView.java
index c06a7efd..bb5b2065 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/WeekLinksView.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/home/WeekLinksView.java
@@ -1,7 +1,7 @@
 package com.dlsc.jfxcentral2.mobile.home;
 
 import com.dlsc.gemsfx.Spacer;
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.components.CustomMarkdownView;
 import com.dlsc.jfxcentral2.components.SizeSupport;
@@ -61,7 +61,7 @@ public WeekLinksView() {
             }
             DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL);
             String date = String.format("## Posted on %s%n%n", formatter.format(linksOfTheWeek.getCreatedOn()));
-            String mdStr = DataRepository2.getInstance().getLinksOfTheWeekReadMe(linksOfTheWeek);
+            String mdStr = DataRepository.getInstance().getLinksOfTheWeekReadMe(linksOfTheWeek);
             return date + mdStr;
         }, linksOfTheWeekProperty()));
 
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileHomePage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileHomePage.java
index ef11e248..466d0349 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileHomePage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileHomePage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral.data.model.Library;
@@ -110,31 +110,31 @@ private Node createNormalView() {
 
         LearnCategoryBox learnCategoryBox = new LearnCategoryBox();
 
-        List<RealWorldApp> randomApps = getRandomSample(DataRepository2.getInstance().getRealWorldApps(), 3);
+        List<RealWorldApp> randomApps = getRandomSample(DataRepository.getInstance().getRealWorldApps(), 3);
         CategoryPreviewView showCasePreviewView = CategoryPreviewView.createShowCasePreviewView(randomApps, PagePath.SHOWCASES);
         showCasePreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Tip> randomTips = getRandomSample(DataRepository2.getInstance().getTips(), 2);
+        List<Tip> randomTips = getRandomSample(DataRepository.getInstance().getTips(), 2);
         CategoryPreviewView tipsPreviewView = CategoryPreviewView.createTipsPreviewView(randomTips, PagePath.TIPS);
         tipsPreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Person> randomPeople = getRandomSample(DataRepository2.getInstance().getPeople(), 3);
+        List<Person> randomPeople = getRandomSample(DataRepository.getInstance().getPeople(), 3);
         CategoryPreviewView peoplePreviewView = CategoryPreviewView.createPeoplePreviewView(randomPeople, PagePath.PEOPLE);
         peoplePreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Book> randomBooks = getRandomSample(DataRepository2.getInstance().getBooks(), 3);
+        List<Book> randomBooks = getRandomSample(DataRepository.getInstance().getBooks(), 3);
         CategoryPreviewView booksPreviewView = CategoryPreviewView.createBooksPreviewView(randomBooks, PagePath.BOOKS);
         booksPreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Library> randomLibraries = getRandomSample(DataRepository2.getInstance().getLibraries(), 3);
+        List<Library> randomLibraries = getRandomSample(DataRepository.getInstance().getLibraries(), 3);
         CategoryPreviewView libraryPreviewView = CategoryPreviewView.createLibraryPreviewView(randomLibraries, PagePath.LIBRARIES);
         libraryPreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Video> randomVideos = getRandomSample(DataRepository2.getInstance().getVideos(), 3);
+        List<Video> randomVideos = getRandomSample(DataRepository.getInstance().getVideos(), 3);
         CategoryPreviewView videoPreviewView = CategoryPreviewView.createVideosPreviewView(randomVideos, PagePath.VIDEOS);
         videoPreviewView.sizeProperty().bind(sizeProperty());
 
-        List<Blog> randomBlogs = getRandomSample(DataRepository2.getInstance().getBlogs(), 2);
+        List<Blog> randomBlogs = getRandomSample(DataRepository.getInstance().getBlogs(), 2);
         CategoryPreviewView blogPreviewView = CategoryPreviewView.createBlogPreviewView(randomBlogs, PagePath.BLOGS);
         blogPreviewView.sizeProperty().bind(sizeProperty());
 
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileLinksOfTheWeekPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileLinksOfTheWeekPage.java
index b07a4e3b..cc8b1c9a 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileLinksOfTheWeekPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/MobileLinksOfTheWeekPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
 import com.dlsc.jfxcentral2.components.MobilePageBase;
 import com.dlsc.jfxcentral2.mobile.components.LotwPagination;
@@ -34,7 +34,7 @@ public MobileLinksOfTheWeekPage() {
         header.setIcon(IkonUtil.getModelIkon(LinksOfTheWeek.class));
 
         // sort by date
-        ArrayList<LinksOfTheWeek> sortedLinks = new ArrayList<>(DataRepository2.getInstance().getLinksOfTheWeek());
+        ArrayList<LinksOfTheWeek> sortedLinks = new ArrayList<>(DataRepository.getInstance().getLinksOfTheWeek());
         sortedLinks.sort(Comparator.comparing(LinksOfTheWeek::getCreatedOn).reversed());
 
         LotwPagination pagination = new LotwPagination();
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBlogsCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBlogsCategoryPage.java
index 96b46ef8..fcad88bd 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBlogsCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBlogsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Blog;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -54,6 +54,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Blog> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getBlogs());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getBlogs());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBooksCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBooksCategoryPage.java
index eb09295d..d4f372bd 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBooksCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileBooksCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Book;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
 import com.dlsc.jfxcentral2.model.Size;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Book> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getBooks());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getBooks());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileCompaniesCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileCompaniesCategoryPage.java
index e71238a1..807fcb44 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileCompaniesCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileCompaniesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Company;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Company> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getCompanies());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getCompanies());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileDocPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileDocPage.java
index f8969d68..79e519fa 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileDocPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileDocPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Documentation;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -54,6 +54,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Documentation> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getDocumentation());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getDocumentation());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnJavaFXCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnJavaFXCategoryPage.java
index 3d656c73..e9c15c7d 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnJavaFXCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnJavaFXCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -20,7 +20,7 @@ protected String getCategoryTitle() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnJavaFX());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnJavaFX());
     }
 
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnMobileCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnMobileCategoryPage.java
index 9f516113..22af854e 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnMobileCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnMobileCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -20,6 +20,6 @@ protected String getCategoryTitle() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnMobile());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnMobile());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnRaspberryPiCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnRaspberryPiCategoryPage.java
index 39e64a95..76800a22 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnRaspberryPiCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLearnRaspberryPiCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
@@ -20,6 +20,6 @@ protected String getCategoryTitle() {
 
     @Override
     protected ObservableList<Learn> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLearnRaspberryPi());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLearnRaspberryPi());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLibrariesCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLibrariesCategoryPage.java
index ade1d24b..5e591df1 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLibrariesCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileLibrariesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Library;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Library> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getLibraries());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getLibraries());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobilePeopleCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobilePeopleCategoryPage.java
index 572bbc25..b6437f11 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobilePeopleCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobilePeopleCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -35,7 +35,7 @@ protected void handleImage(Person person, ObjectProperty<Image> imageProperty) {
 
             @Override
             protected String getSummary(Person person) {
-                return DataRepository2.getInstance().getPersonReadMe(person);
+                return DataRepository.getInstance().getPersonReadMe(person);
             }
         };
     }
@@ -44,7 +44,7 @@ protected String getSummary(Person person) {
     protected Callback<String, Predicate<Person>> getFilter() {
         return text -> person -> StringUtils.isBlank(text)
                 || StringUtils.containsIgnoreCase(person.getName(), text)
-                || StringUtils.containsIgnoreCase(DataRepository2.getInstance().getPersonReadMe(person), text)
+                || StringUtils.containsIgnoreCase(DataRepository.getInstance().getPersonReadMe(person), text)
                 || StringUtils.containsIgnoreCase(person.getDescription(), text);
     }
 
@@ -65,6 +65,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Person> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getPeople());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getPeople());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileShowcasesCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileShowcasesCategoryPage.java
index a36cd2e3..e6d0dae2 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileShowcasesCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileShowcasesCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
 import com.dlsc.jfxcentral2.model.Size;
@@ -48,7 +48,7 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<RealWorldApp> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getRealWorldApps());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getRealWorldApps());
     }
 
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTipCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTipCategoryPage.java
index cdd14f8b..aa7b181f 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTipCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTipCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Tip;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Tip> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTips());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTips());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileToolsCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileToolsCategoryPage.java
index 48783061..d32566ba 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileToolsCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileToolsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Tool;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Tool> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTools());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTools());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTutorialsCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTutorialsCategoryPage.java
index 211af58a..a8a65807 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTutorialsCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileTutorialsCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Tutorial;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Tutorial> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getTutorials());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getTutorials());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileVideosCategoryPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileVideosCategoryPage.java
index 4a41f21a..8fcddad8 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileVideosCategoryPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/category/MobileVideosCategoryPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.category;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Video;
 import com.dlsc.jfxcentral2.mobile.components.ModelListCell;
@@ -48,6 +48,6 @@ protected String getSearchPromptText() {
 
     @Override
     protected ObservableList<Video> getCategoryItems() {
-        return FXCollections.observableArrayList(DataRepository2.getInstance().getVideos());
+        return FXCollections.observableArrayList(DataRepository.getInstance().getVideos());
     }
 }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileDetailsPageBase.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileDetailsPageBase.java
index a3829c6e..8d9c4fd3 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileDetailsPageBase.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileDetailsPageBase.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.details;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.ModelObject;
 import com.dlsc.jfxcentral2.components.MobilePageBase;
 import com.dlsc.jfxcentral2.model.Size;
@@ -18,7 +18,7 @@ public MobileDetailsPageBase(ObjectProperty<Size> size, Class<? extends T> clazz
         this.clazz = clazz;
 
         sizeProperty().bind(size);
-        setItem(DataRepository2.getInstance().getByID(clazz, itemId));
+        setItem(DataRepository.getInstance().getByID(clazz, itemId));
         getChildren().addAll(content());
         getStyleClass().add("mobile-details-page");
     }
diff --git a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileLearnDetailsPage.java b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileLearnDetailsPage.java
index bd23dc22..dc96322c 100644
--- a/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileLearnDetailsPage.java
+++ b/mobile/src/main/java/com/dlsc/jfxcentral2/mobile/pages/details/MobileLearnDetailsPage.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.mobile.pages.details;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Learn;
 import com.dlsc.jfxcentral.data.model.LearnJavaFX;
 import com.dlsc.jfxcentral.data.model.LearnMobile;
@@ -32,16 +32,16 @@ public List<Node> content() {
         // content
         LearnPagination<Learn> detailsView = new LearnPagination<>();
         if (learn instanceof LearnJavaFX) {
-            detailsView.setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/javafx/" + learn.getId());
-            List<LearnJavaFX> learnJavaFX = DataRepository2.getInstance().getLearnJavaFX();
+            detailsView.setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/javafx/" + learn.getId());
+            List<LearnJavaFX> learnJavaFX = DataRepository.getInstance().getLearnJavaFX();
             detailsView.getItems().setAll(learnJavaFX);
         } else if (learn instanceof LearnMobile) {
-            detailsView.setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/mobile/" + learn.getId());
-            List<LearnMobile> learnMobile = DataRepository2.getInstance().getLearnMobile();
+            detailsView.setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/mobile/" + learn.getId());
+            List<LearnMobile> learnMobile = DataRepository.getInstance().getLearnMobile();
             detailsView.getItems().setAll(learnMobile);
         } else if (learn instanceof LearnRaspberryPi) {
-            List<LearnRaspberryPi> learnRaspberryPi = DataRepository2.getInstance().getLearnRaspberryPi();
-            detailsView.setBaseURL(DataRepository2.getInstance().getRepositoryDirectoryURL() + "learn/raspberrypi/" + learn.getId());
+            List<LearnRaspberryPi> learnRaspberryPi = DataRepository.getInstance().getLearnRaspberryPi();
+            detailsView.setBaseURL(DataRepository.getInstance().getRepositoryDirectoryURL() + "learn/raspberrypi/" + learn.getId());
             detailsView.getItems().setAll(learnRaspberryPi);
         }
         detailsView.setSelectedItem(learn);
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/HelloTeamView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/HelloTeamView.java
index e21e9b3c..976dcadb 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/HelloTeamView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/HelloTeamView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.TeamView;
 import javafx.scene.Node;
@@ -15,7 +15,7 @@ public class HelloTeamView extends JFXCentralSampleBase {
     protected Region createControl() {
         teamView = new TeamView();
 
-        teamView.getMembers().setAll(DataRepository2.getInstance().getMembers());
+        teamView.getMembers().setAll(DataRepository.getInstance().getMembers());
         return new ScrollPane(teamView);
     }
 
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloDownloadsBox.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloDownloadsBox.java
index cb49e0f7..fffbf06a 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloDownloadsBox.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloDownloadsBox.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Download;
 import com.dlsc.jfxcentral2.components.DownloadsBox;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
@@ -15,7 +15,7 @@ public class HelloDownloadsBox extends JFXCentralSampleBase {
 
     @Override
     protected Region createControl() {
-        Download download = DataRepository2.getInstance().getDownloads().get(0);
+        Download download = DataRepository.getInstance().getDownloads().get(0);
         downloadsBox = new DownloadsBox(download);
         return new StackPane(downloadsBox);
     }
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonGridView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonGridView.java
index fd16ddef..02536ff8 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonGridView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonGridView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.gridview.IkonGridView;
 import com.dlsc.jfxcentral2.demo.JFXCentralSampleBase;
@@ -19,7 +19,7 @@ public class HelloIkonGridView extends JFXCentralSampleBase {
     @Override
     protected Region createControl() {
         ikonGridView = new IkonGridView();
-        List<Ikon> ikonList = IkonliPackUtil.getInstance().getIkonList(DataRepository2.getInstance().getIkonliPacks().get(0));
+        List<Ikon> ikonList = IkonliPackUtil.getInstance().getIkonList(DataRepository.getInstance().getIkonliPacks().get(0));
         ikonGridView.getItems().addAll(ikonList);
         return new ScrollPane(ikonGridView);
     }
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonPackTileView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonPackTileView.java
index f4010918..164b9e76 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonPackTileView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloIkonPackTileView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.IkonliPack;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.tiles.IkonliPackTileView;
@@ -15,7 +15,7 @@ public class HelloIkonPackTileView extends JFXCentralSampleBase {
 
     @Override
     protected Region createControl() {
-        IkonliPack ikonPackModel = DataRepository2.getInstance().getIkonliPacks().get(0);
+        IkonliPack ikonPackModel = DataRepository.getInstance().getIkonliPacks().get(0);
         ikonPackModel.setDescription("Some description");
 
         ikonPackModelTileView = new IkonliPackTileView(ikonPackModel);
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloLibraryTileView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloLibraryTileView.java
index 39a76dcc..ee404547 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloLibraryTileView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloLibraryTileView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Library;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.tiles.LibraryTileView;
@@ -15,7 +15,7 @@ public class HelloLibraryTileView extends JFXCentralSampleBase {
 
     @Override
     protected Region createControl() {
-        Library library = DataRepository2.getInstance().getLibraries().stream().filter(l -> l.getId().equalsIgnoreCase("FXGL")).findFirst().get();
+        Library library = DataRepository.getInstance().getLibraries().stream().filter(l -> l.getId().equalsIgnoreCase("FXGL")).findFirst().get();
 
         libraryTileView = new LibraryTileView(library);
         return new ScrollPane(libraryTileView);
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloPackGridView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloPackGridView.java
index 69ec7303..bebdf18f 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloPackGridView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloPackGridView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.IkonliPack;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.gridview.ModelGridView;
@@ -19,7 +19,7 @@ protected Region createControl() {
 
         gridView = new ModelGridView<>();
         gridView.setTileViewProvider(IkonliPackTileView::new);
-        gridView.getItems().setAll(DataRepository2.getInstance().getIkonliPacks());
+        gridView.getItems().setAll(DataRepository.getInstance().getIkonliPacks());
 
         return new ScrollPane(gridView);
     }
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloTopContentView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloTopContentView.java
index a0ce512d..d403838c 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloTopContentView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/components/HelloTopContentView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.components;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Tool;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.components.topcontent.TopContentView;
@@ -19,7 +19,7 @@ protected Region createControl() {
 
         topContentView = new TopContentView<>();
 
-        topContentView.getItems().setAll(DataRepository2.getInstance().getTools());
+        topContentView.getItems().setAll(DataRepository.getInstance().getTools());
 
         return new ScrollPane(topContentView);
     }
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/devtools/HelloSVGPathExtractorView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/devtools/HelloSVGPathExtractorView.java
index 23a8bd72..6f790188 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/devtools/HelloSVGPathExtractorView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/devtools/HelloSVGPathExtractorView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.devtools;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.model.Utility;
 import com.dlsc.jfxcentral2.components.SizeComboBox;
 import com.dlsc.jfxcentral2.demo.JFXCentralSampleBase;
@@ -17,7 +17,7 @@ public class HelloSVGPathExtractorView extends JFXCentralSampleBase {
 
     @Override
     protected Region createControl() {
-        Optional<Utility> path = DataRepository2.getInstance().getUtilities().stream().filter(t -> t.getId().contains("path")).findFirst();
+        Optional<Utility> path = DataRepository.getInstance().getUtilities().stream().filter(t -> t.getId().contains("path")).findFirst();
         view = new SVGPathExtractorView(path.get());
         ScrollPane scrollPane = new ScrollPane(view);
         scrollPane.setPrefWidth(1600);
diff --git a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/mobile/HelloCategoryPreviewView.java b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/mobile/HelloCategoryPreviewView.java
index 6f579b9a..52637e66 100644
--- a/sampler/src/main/java/com/dlsc/jfxcentral2/demo/mobile/HelloCategoryPreviewView.java
+++ b/sampler/src/main/java/com/dlsc/jfxcentral2/demo/mobile/HelloCategoryPreviewView.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.demo.mobile;
 
-import com.dlsc.jfxcentral.data.DataRepository2;
+import com.dlsc.jfxcentral.data.DataRepository;
 import com.dlsc.jfxcentral.data.ImageManager;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
@@ -45,7 +45,7 @@ private CategoryPreviewView createShowCasePreviewView() {
         view.setTitle("Real World Apps");
         view.setShowAllUrl(PagePath.SHOWCASES);
         List<CategoryPreviewView.CategoryItem> items = new ArrayList<>();
-        List<RealWorldApp> apps = DataRepository2.getInstance().getRealWorldApps();
+        List<RealWorldApp> apps = DataRepository.getInstance().getRealWorldApps();
         for (int i = 0; i < 2; i++) {
             RealWorldApp app = apps.get(random.nextInt(apps.size()));
             CategoryPreviewView.CategoryItem item = new CategoryPreviewView.CategoryItem(
@@ -71,13 +71,13 @@ private CategoryPreviewView createPeoplePreviewView() {
         view.setTitle("People");
         view.setShowAllUrl(PagePath.PEOPLE);
         List<CategoryPreviewView.CategoryItem> items = new ArrayList<>();
-        List<Person> people = DataRepository2.getInstance().getPeople();
+        List<Person> people = DataRepository.getInstance().getPeople();
 
         for (int i = 0; i < 2; i++) {
             Person person = people.get(random.nextInt(people.size()));
             CategoryPreviewView.CategoryItem item = new CategoryPreviewView.CategoryItem(
                     person.getName(),
-                    DataRepository2.getInstance().getPersonReadMe(person),
+                    DataRepository.getInstance().getPersonReadMe(person),
                     null,
                     ImageManager.getInstance().personImageProperty(person),
                     ModelObjectTool.getModelLink(person),
@@ -98,7 +98,7 @@ private CategoryPreviewView createTipsPreviewView() {
         view.setTitle("Tips");
         view.setShowAllUrl(PagePath.TIPS);
         List<CategoryPreviewView.CategoryItem> items = new ArrayList<>();
-        List<Tip> tips = DataRepository2.getInstance().getTips();
+        List<Tip> tips = DataRepository.getInstance().getTips();
         for (int i = 0; i < 2; i++) {
             Tip tip = tips.get(random.nextInt(tips.size()));
             CategoryPreviewView.CategoryItem item = new CategoryPreviewView.CategoryItem(