diff --git a/components/GetNextEpisodeTask.bs b/components/GetNextEpisodeTask.bs
index 84dc400c..f1f98af7 100644
--- a/components/GetNextEpisodeTask.bs
+++ b/components/GetNextEpisodeTask.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/GetPlaybackInfoTask.bs b/components/GetPlaybackInfoTask.bs
index 0cd6374d..02483931 100644
--- a/components/GetPlaybackInfoTask.bs
+++ b/components/GetPlaybackInfoTask.bs
@@ -1,7 +1,7 @@
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
+import "pkg:/source/api/baserequest.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/GetShuffleEpisodesTask.bs b/components/GetShuffleEpisodesTask.bs
index b82484cd..b4474ad1 100644
--- a/components/GetShuffleEpisodesTask.bs
+++ b/components/GetShuffleEpisodesTask.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/ItemGrid/FavoriteItemsTask.bs b/components/ItemGrid/FavoriteItemsTask.bs
index cd3a0bbc..03e5012b 100644
--- a/components/ItemGrid/FavoriteItemsTask.bs
+++ b/components/ItemGrid/FavoriteItemsTask.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/UserLibrary.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/UserLibrary.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "setFavoriteStatus"
diff --git a/components/ItemGrid/GridItem.bs b/components/ItemGrid/GridItem.bs
index ff624e7d..3e95e67b 100644
--- a/components/ItemGrid/GridItem.bs
+++ b/components/ItemGrid/GridItem.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("GridItem")
diff --git a/components/ItemGrid/GridItemSmall.bs b/components/ItemGrid/GridItemSmall.bs
index abee7423..606f0446 100644
--- a/components/ItemGrid/GridItemSmall.bs
+++ b/components/ItemGrid/GridItemSmall.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.itemPoster = m.top.findNode("itemPoster")
diff --git a/components/ItemGrid/ItemGrid.bs b/components/ItemGrid/ItemGrid.bs
index 0cd567b5..1fddf253 100644
--- a/components/ItemGrid/ItemGrid.bs
+++ b/components/ItemGrid/ItemGrid.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("ItemGrid")
diff --git a/components/ItemGrid/ItemGridOptions.bs b/components/ItemGrid/ItemGridOptions.bs
index 3fef8cae..df24e4a7 100644
--- a/components/ItemGrid/ItemGridOptions.bs
+++ b/components/ItemGrid/ItemGridOptions.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("ItemGridOptions")
diff --git a/components/ItemGrid/LoadItemsTask2.bs b/components/ItemGrid/LoadItemsTask2.bs
index 22d1ffd1..6c51ef63 100644
--- a/components/ItemGrid/LoadItemsTask2.bs
+++ b/components/ItemGrid/LoadItemsTask2.bs
@@ -1,10 +1,10 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/ItemGrid/LoadVideoContentTask.bs b/components/ItemGrid/LoadVideoContentTask.bs
index 50a97855..7375b352 100644
--- a/components/ItemGrid/LoadVideoContentTask.bs
+++ b/components/ItemGrid/LoadVideoContentTask.bs
@@ -1,11 +1,11 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/UserLibrary.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/userauth.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/UserLibrary.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/userauth.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.user = AboutMe()
diff --git a/components/ItemGrid/MovieLibraryView.bs b/components/ItemGrid/MovieLibraryView.bs
index 97c17439..1eb56c95 100644
--- a/components/ItemGrid/MovieLibraryView.bs
+++ b/components/ItemGrid/MovieLibraryView.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub setupNodes()
     m.options = m.top.findNode("options")
diff --git a/components/ItemGrid/MusicArtistGridItem.bs b/components/ItemGrid/MusicArtistGridItem.bs
index c639d919..96af114d 100644
--- a/components/ItemGrid/MusicArtistGridItem.bs
+++ b/components/ItemGrid/MusicArtistGridItem.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.itemPoster = m.top.findNode("itemPoster")
diff --git a/components/ItemGrid/MusicLibraryView.bs b/components/ItemGrid/MusicLibraryView.bs
index 6b06fb23..5d064874 100644
--- a/components/ItemGrid/MusicLibraryView.bs
+++ b/components/ItemGrid/MusicLibraryView.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub setupNodes()
     m.options = m.top.findNode("options")
diff --git a/components/JFOverhang.bs b/components/JFOverhang.bs
index d118b22c..360773e1 100644
--- a/components/JFOverhang.bs
+++ b/components/JFOverhang.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.id = "overhang"
diff --git a/components/JFScene.bs b/components/JFScene.bs
index a0de1016..beee34b7 100644
--- a/components/JFScene.bs
+++ b/components/JFScene.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.backgroundColor = "#262626" '"#101010"
diff --git a/components/JFScreen.bs b/components/JFScreen.bs
index 449824ba..e493e07b 100644
--- a/components/JFScreen.bs
+++ b/components/JFScreen.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     ' initialize the log manager. second param sets log output:
diff --git a/components/JFVideo.bs b/components/JFVideo.bs
index 8910d4a6..bcf8a4a5 100644
--- a/components/JFVideo.bs
+++ b/components/JFVideo.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.playbackTimer = m.top.findNode("playbackTimer")
diff --git a/components/ListPoster.bs b/components/ListPoster.bs
index 6ad15ab3..2c9337a8 100644
--- a/components/ListPoster.bs
+++ b/components/ListPoster.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.title = m.top.findNode("title")
diff --git a/components/PersonDetails.bs b/components/PersonDetails.bs
index 8104c7bf..e0680bdb 100644
--- a/components/PersonDetails.bs
+++ b/components/PersonDetails.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.dscr = m.top.findNode("description")
diff --git a/components/PlaystateTask.bs b/components/PlaystateTask.bs
index ceac6086..fc06ae3e 100644
--- a/components/PlaystateTask.bs
+++ b/components/PlaystateTask.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "PlaystateUpdate"
diff --git a/components/RadioDialog.bs b/components/RadioDialog.bs
index a3250a5e..9d79a0ee 100644
--- a/components/RadioDialog.bs
+++ b/components/RadioDialog.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.contentArea = m.top.findNode("contentArea")
diff --git a/components/SearchBox.bs b/components/SearchBox.bs
index c9c14ebc..e745a269 100644
--- a/components/SearchBox.bs
+++ b/components/SearchBox.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.top.layoutDirection = "vert"
diff --git a/components/captionTask.bs b/components/captionTask.bs
index 37841134..8ea8e9b4 100644
--- a/components/captionTask.bs
+++ b/components/captionTask.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/baserequest.bs"
 
 sub init()
     m.top.observeField("url", "fetchCaption")
diff --git a/components/config/ConfigList.bs b/components/config/ConfigList.bs
index f2c4f49c..5c3bd003 100644
--- a/components/config/ConfigList.bs
+++ b/components/config/ConfigList.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.itemComponentName = "ConfigItem"
diff --git a/components/config/ServerDiscoveryTask.bs b/components/config/ServerDiscoveryTask.bs
index f993f3ed..f9dbbaaa 100644
--- a/components/config/ServerDiscoveryTask.bs
+++ b/components/config/ServerDiscoveryTask.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 '
 ' Task used to discover jellyfin servers on the local network
diff --git a/components/config/SetServerScreen.bs b/components/config/SetServerScreen.bs
index 34c4250a..4393a17d 100644
--- a/components/config/SetServerScreen.bs
+++ b/components/config/SetServerScreen.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/roku_modules/log/LogMixin.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.log = log.Logger("SetServerScreen")
diff --git a/components/data/ChannelData.bs b/components/data/ChannelData.bs
index 5151efa9..ff4ec818 100644
--- a/components/data/ChannelData.bs
+++ b/components/data/ChannelData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/CollectionData.bs b/components/data/CollectionData.bs
index 6d0c7942..4cce7d18 100644
--- a/components/data/CollectionData.bs
+++ b/components/data/CollectionData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/FolderData.bs b/components/data/FolderData.bs
index 89eacbf7..7e6da642 100644
--- a/components/data/FolderData.bs
+++ b/components/data/FolderData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/GetFiltersTask.bs b/components/data/GetFiltersTask.bs
index 5159a6da..05e55b50 100644
--- a/components/data/GetFiltersTask.bs
+++ b/components/data/GetFiltersTask.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/data/HomeData.bs b/components/data/HomeData.bs
index 4266cc70..1ae39b88 100644
--- a/components/data/HomeData.bs
+++ b/components/data/HomeData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
 
 sub setData()
     ' We keep json around just as a reference,
diff --git a/components/data/MovieData.bs b/components/data/MovieData.bs
index 65b5681e..cba66f81 100644
--- a/components/data/MovieData.bs
+++ b/components/data/MovieData.bs
@@ -1,7 +1,7 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/MusicAlbumSongListData.bs b/components/data/MusicAlbumSongListData.bs
index 3578441c..9583cdb4 100644
--- a/components/data/MusicAlbumSongListData.bs
+++ b/components/data/MusicAlbumSongListData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/MusicArtistData.bs b/components/data/MusicArtistData.bs
index 94b09c29..6f36dc9b 100644
--- a/components/data/MusicArtistData.bs
+++ b/components/data/MusicArtistData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/OptionsButton.bs b/components/data/OptionsButton.bs
index 1f8366a4..e103abdf 100644
--- a/components/data/OptionsButton.bs
+++ b/components/data/OptionsButton.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
 end sub
diff --git a/components/data/OptionsData.bs b/components/data/OptionsData.bs
index a7c65852..980d34f0 100644
--- a/components/data/OptionsData.bs
+++ b/components/data/OptionsData.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.value_index = 0
diff --git a/components/data/PersonData.bs b/components/data/PersonData.bs
index c4e25fe5..71745b06 100644
--- a/components/data/PersonData.bs
+++ b/components/data/PersonData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/PhotoData.bs b/components/data/PhotoData.bs
index 16971e84..30443f3d 100644
--- a/components/data/PhotoData.bs
+++ b/components/data/PhotoData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/SceneManager.bs b/components/data/SceneManager.bs
index 51aaaf9d..65b28d29 100644
--- a/components/data/SceneManager.bs
+++ b/components/data/SceneManager.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("SceneManager")
diff --git a/components/data/ScheduleProgramData.bs b/components/data/ScheduleProgramData.bs
index 5da1c393..c2712620 100644
--- a/components/data/ScheduleProgramData.bs
+++ b/components/data/ScheduleProgramData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/SeriesData.bs b/components/data/SeriesData.bs
index ce660845..f3671f38 100644
--- a/components/data/SeriesData.bs
+++ b/components/data/SeriesData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/TVEpisode.bs b/components/data/TVEpisode.bs
index a296d86e..6c0542c0 100644
--- a/components/data/TVEpisode.bs
+++ b/components/data/TVEpisode.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/data/UserData.bs b/components/data/UserData.bs
index 446abbf3..e20262e0 100644
--- a/components/data/UserData.bs
+++ b/components/data/UserData.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/config.bs"
 
 sub setDataFromJSON()
     json = m.top.json
diff --git a/components/data/VideoData.bs b/components/data/VideoData.bs
index 49c6d752..1a765403 100644
--- a/components/data/VideoData.bs
+++ b/components/data/VideoData.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub setFields()
     json = m.top.json
diff --git a/components/home/Home.bs b/components/home/Home.bs
index 00e056f6..93475499 100644
--- a/components/home/Home.bs
+++ b/components/home/Home.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.overhangTitle = "Home"
diff --git a/components/home/HomeItem.bs b/components/home/HomeItem.bs
index 8fb83529..d6cb0167 100644
--- a/components/home/HomeItem.bs
+++ b/components/home/HomeItem.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("HomeItem")
diff --git a/components/home/HomeRows.bs b/components/home/HomeRows.bs
index 4fce8fff..987ba8f3 100644
--- a/components/home/HomeRows.bs
+++ b/components/home/HomeRows.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.itemComponentName = "HomeItem"
diff --git a/components/home/LoadItemsTask.bs b/components/home/LoadItemsTask.bs
index 79bb2d38..59902b9a 100644
--- a/components/home/LoadItemsTask.bs
+++ b/components/home/LoadItemsTask.bs
@@ -1,9 +1,9 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
-import "pkg:/source/api/Image.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
+import "pkg:/source/api/Image.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/liveTv/LoadChannelsTask.bs b/components/liveTv/LoadChannelsTask.bs
index 482188bd..7d00651d 100644
--- a/components/liveTv/LoadChannelsTask.bs
+++ b/components/liveTv/LoadChannelsTask.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "loadChannels"
diff --git a/components/liveTv/LoadProgramDetailsTask.bs b/components/liveTv/LoadProgramDetailsTask.bs
index 686dba86..3d7ec56e 100644
--- a/components/liveTv/LoadProgramDetailsTask.bs
+++ b/components/liveTv/LoadProgramDetailsTask.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "loadProgramDetails"
diff --git a/components/liveTv/LoadSheduleTask.bs b/components/liveTv/LoadSheduleTask.bs
index d898f50a..7c614d95 100644
--- a/components/liveTv/LoadSheduleTask.bs
+++ b/components/liveTv/LoadSheduleTask.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "loadSchedule"
diff --git a/components/liveTv/ProgramDetails.bs b/components/liveTv/ProgramDetails.bs
index 3afe92ae..617959f1 100644
--- a/components/liveTv/ProgramDetails.bs
+++ b/components/liveTv/ProgramDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
 
diff --git a/components/liveTv/RecordProgramTask.bs b/components/liveTv/RecordProgramTask.bs
index 81243a5e..b432bc05 100644
--- a/components/liveTv/RecordProgramTask.bs
+++ b/components/liveTv/RecordProgramTask.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 
 sub init()
     m.log = log.Logger("RecordProgramTask")
diff --git a/components/manager/QueueManager.bs b/components/manager/QueueManager.bs
index ca9f30fa..6e000fe2 100644
--- a/components/manager/QueueManager.bs
+++ b/components/manager/QueueManager.bs
@@ -1,10 +1,10 @@
-import "pkg:/source/utils/misc.brs"
-import "ViewCreator.brs"
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/utils/misc.bs"
+import "ViewCreator.bs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.hold = []
diff --git a/components/mediaPlayers/AudioPlayer.bs b/components/mediaPlayers/AudioPlayer.bs
index 4d6fc3d2..db375008 100644
--- a/components/mediaPlayers/AudioPlayer.bs
+++ b/components/mediaPlayers/AudioPlayer.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.playReported = false
diff --git a/components/movies/MovieDetails.bs b/components/movies/MovieDetails.bs
index 913ccd79..aa47cdb9 100644
--- a/components/movies/MovieDetails.bs
+++ b/components/movies/MovieDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.extrasGrp = m.top.findnode("extrasGrp")
diff --git a/components/music/AlbumGrid.bs b/components/music/AlbumGrid.bs
index b167c588..a7d1ef9a 100644
--- a/components/music/AlbumGrid.bs
+++ b/components/music/AlbumGrid.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     getData()
diff --git a/components/music/AlbumView.bs b/components/music/AlbumView.bs
index e5a0e2ee..ae648a58 100644
--- a/components/music/AlbumView.bs
+++ b/components/music/AlbumView.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/music/ArtistView.bs b/components/music/ArtistView.bs
index 38336ecf..f3d61e3d 100644
--- a/components/music/ArtistView.bs
+++ b/components/music/ArtistView.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/music/AudioPlayerView.bs b/components/music/AudioPlayerView.bs
index 3047c331..73caa78b 100644
--- a/components/music/AudioPlayerView.bs
+++ b/components/music/AudioPlayerView.bs
@@ -1,7 +1,7 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/music/PlaylistView.bs b/components/music/PlaylistView.bs
index a912dcfb..cc404adf 100644
--- a/components/music/PlaylistView.bs
+++ b/components/music/PlaylistView.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/music/SongItem.bs b/components/music/SongItem.bs
index c9db0bfe..fef32417 100644
--- a/components/music/SongItem.bs
+++ b/components/music/SongItem.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.itemText = m.top.findNode("itemText")
diff --git a/components/photos/LoadPhotoTask.bs b/components/photos/LoadPhotoTask.bs
index 78302fec..5f45c548 100644
--- a/components/photos/LoadPhotoTask.bs
+++ b/components/photos/LoadPhotoTask.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/baserequest.bs"
 
 sub init()
     m.top.functionName = "loadItems"
diff --git a/components/photos/PhotoDetails.bs b/components/photos/PhotoDetails.bs
index 93f37f44..d2dbdf32 100644
--- a/components/photos/PhotoDetails.bs
+++ b/components/photos/PhotoDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.optionsAvailable = true
diff --git a/components/quickConnect/QuickConnect.bs b/components/quickConnect/QuickConnect.bs
index 36fbdfb2..5c0edefe 100644
--- a/components/quickConnect/QuickConnect.bs
+++ b/components/quickConnect/QuickConnect.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/userauth.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/userauth.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.functionName = "monitorQuickConnect"
diff --git a/components/quickConnect/QuickConnectDialog.bs b/components/quickConnect/QuickConnectDialog.bs
index c646b146..62e657c5 100644
--- a/components/quickConnect/QuickConnectDialog.bs
+++ b/components/quickConnect/QuickConnectDialog.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/api/userauth.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/api/userauth.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
 import "pkg:/source/utils/session.bs"
 
 sub init()
diff --git a/components/search/SearchResults.bs b/components/search/SearchResults.bs
index 8427232d..551dfa51 100644
--- a/components/search/SearchResults.bs
+++ b/components/search/SearchResults.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/search/SearchRow.bs b/components/search/SearchRow.bs
index ffbe0920..7be4b494 100644
--- a/components/search/SearchRow.bs
+++ b/components/search/SearchRow.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.top.itemComponentName = "ListPoster"
diff --git a/components/search/SearchTask.bs b/components/search/SearchTask.bs
index 2591b7d4..935fd43e 100644
--- a/components/search/SearchTask.bs
+++ b/components/search/SearchTask.bs
@@ -1,8 +1,8 @@
-import "pkg:/source/api/Items.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/utils/deviceCapabilities.brs"
+import "pkg:/source/api/Items.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/utils/deviceCapabilities.bs"
 
 sub init()
     m.top.functionName = "search"
diff --git a/components/section/section.bs b/components/section/section.bs
index 336ceb64..3a14c4e0 100644
--- a/components/section/section.bs
+++ b/components/section/section.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.showFromBottomAnimation = m.top.findNode("showFromBottomAnimation")
diff --git a/components/section/sectionScroller.bs b/components/section/sectionScroller.bs
index c8bd1103..7644049f 100644
--- a/components/section/sectionScroller.bs
+++ b/components/section/sectionScroller.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.previouslyDisplayedSection = 0
diff --git a/components/settings/settings.bs b/components/settings/settings.bs
index d4354e06..32213f45 100644
--- a/components/settings/settings.bs
+++ b/components/settings/settings.bs
@@ -1,6 +1,6 @@
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/roku_modules/log/LogMixin.bs"
 import "pkg:/source/api/sdk.bs"
 
 sub init()
diff --git a/components/tvshows/TVEpisodeRowWithOptions.bs b/components/tvshows/TVEpisodeRowWithOptions.bs
index e580c11a..d982d82c 100644
--- a/components/tvshows/TVEpisodeRowWithOptions.bs
+++ b/components/tvshows/TVEpisodeRowWithOptions.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.rows = m.top.findNode("tvEpisodeRow")
diff --git a/components/tvshows/TVEpisodes.bs b/components/tvshows/TVEpisodes.bs
index 8872ffc3..bf92ffe3 100644
--- a/components/tvshows/TVEpisodes.bs
+++ b/components/tvshows/TVEpisodes.bs
@@ -1,7 +1,7 @@
-import "pkg:/source/api/Image.brs"
-import "pkg:/source/api/baserequest.brs"
-import "pkg:/source/utils/config.brs"
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/api/Image.bs"
+import "pkg:/source/api/baserequest.bs"
+import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/tvshows/TVListDetails.bs b/components/tvshows/TVListDetails.bs
index 3b29b3bf..55eadf36 100644
--- a/components/tvshows/TVListDetails.bs
+++ b/components/tvshows/TVListDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.title = m.top.findNode("title")
diff --git a/components/tvshows/TVListOptions.bs b/components/tvshows/TVListOptions.bs
index 7b146d8e..5cf169db 100644
--- a/components/tvshows/TVListOptions.bs
+++ b/components/tvshows/TVListOptions.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
 
diff --git a/components/tvshows/TVShowDescription.bs b/components/tvshows/TVShowDescription.bs
index 9e0b6164..7c7b49e3 100644
--- a/components/tvshows/TVShowDescription.bs
+++ b/components/tvshows/TVShowDescription.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     buttons = m.top.findNode("buttons")
diff --git a/components/tvshows/TVShowDetails.bs b/components/tvshows/TVShowDetails.bs
index e5e1ead4..22ad6725 100644
--- a/components/tvshows/TVShowDetails.bs
+++ b/components/tvshows/TVShowDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     m.top.optionsAvailable = false
diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs
index b4f47948..1e95c4bf 100644
--- a/components/video/VideoPlayerView.bs
+++ b/components/video/VideoPlayerView.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/utils/config.bs"
 
 sub init()
     ' Hide the overhang on init to prevent showing 2 clocks
diff --git a/source/api/sdk.bs b/source/api/sdk.bs
index 51bca783..0d174c37 100644
--- a/source/api/sdk.bs
+++ b/source/api/sdk.bs
@@ -1,4 +1,4 @@
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/api/baserequest.bs"
 
 namespace api
     namespace albums
diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs
index c8f59ce4..c68eb52f 100644
--- a/source/utils/deviceCapabilities.bs
+++ b/source/utils/deviceCapabilities.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.brs"
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/utils/misc.bs"
+import "pkg:/source/api/baserequest.bs"
 
 'Device Capabilities for Roku.
 'This will likely need further tweaking
diff --git a/source/utils/session.bs b/source/utils/session.bs
index 01c5712d..d54899c0 100644
--- a/source/utils/session.bs
+++ b/source/utils/session.bs
@@ -1,6 +1,6 @@
 ' these are needed for ServerInfo() inside session.server.Populate()
-import "pkg:/source/api/userauth.brs"
-import "pkg:/source/api/baserequest.brs"
+import "pkg:/source/api/userauth.bs"
+import "pkg:/source/api/baserequest.bs"
 
 namespace session
     ' Initialize the global session array