diff --git a/lib/application/artifact_details/artifact_details_bloc.dart b/lib/application/artifact/artifact_bloc.dart
similarity index 76%
rename from lib/application/artifact_details/artifact_details_bloc.dart
rename to lib/application/artifact/artifact_bloc.dart
index 7271f59d9..83768fa09 100644
--- a/lib/application/artifact_details/artifact_details_bloc.dart
+++ b/lib/application/artifact/artifact_bloc.dart
@@ -8,21 +8,21 @@ import 'package:genshindb/domain/models/models.dart';
 import 'package:genshindb/domain/services/genshin_service.dart';
 import 'package:genshindb/domain/services/telemetry_service.dart';
 
-part 'artifact_details_bloc.freezed.dart';
-part 'artifact_details_event.dart';
-part 'artifact_details_state.dart';
+part 'artifact_bloc.freezed.dart';
+part 'artifact_event.dart';
+part 'artifact_state.dart';
 
-class ArtifactDetailsBloc extends Bloc<ArtifactDetailsEvent, ArtifactDetailsState> {
+class ArtifactBloc extends Bloc<ArtifactEvent, ArtifactState> {
   final GenshinService _genshinService;
   final TelemetryService _telemetryService;
 
-  ArtifactDetailsBloc(this._genshinService, this._telemetryService) : super(const ArtifactDetailsState.loading());
+  ArtifactBloc(this._genshinService, this._telemetryService) : super(const ArtifactState.loading());
 
   @override
-  Stream<ArtifactDetailsState> mapEventToState(
-    ArtifactDetailsEvent event,
+  Stream<ArtifactState> mapEventToState(
+    ArtifactEvent event,
   ) async* {
-    yield const ArtifactDetailsState.loading();
+    yield const ArtifactState.loading();
 
     final s = await event.map(
       loadArtifact: (e) async {
@@ -34,7 +34,7 @@ class ArtifactDetailsBloc extends Bloc<ArtifactDetailsEvent, ArtifactDetailsStat
         var image = artifact.image.split('.png').first;
         image = image.substring(0, image.length - 1);
 
-        return ArtifactDetailsState.loaded(
+        return ArtifactState.loaded(
           name: translation.name,
           image: artifact.fullImagePath,
           rarityMin: artifact.rarityMin,
diff --git a/lib/application/artifact/artifact_event.dart b/lib/application/artifact/artifact_event.dart
new file mode 100644
index 000000000..a5ddce88e
--- /dev/null
+++ b/lib/application/artifact/artifact_event.dart
@@ -0,0 +1,8 @@
+part of 'artifact_bloc.dart';
+
+@freezed
+abstract class ArtifactEvent with _$ArtifactEvent {
+  const factory ArtifactEvent.loadArtifact({
+    @required String key,
+  }) = _LoadArtifact;
+}
diff --git a/lib/application/artifact_details/artifact_details_state.dart b/lib/application/artifact/artifact_state.dart
similarity index 55%
rename from lib/application/artifact_details/artifact_details_state.dart
rename to lib/application/artifact/artifact_state.dart
index 30da866cc..92bb856d4 100644
--- a/lib/application/artifact_details/artifact_details_state.dart
+++ b/lib/application/artifact/artifact_state.dart
@@ -1,10 +1,10 @@
-part of 'artifact_details_bloc.dart';
+part of 'artifact_bloc.dart';
 
 @freezed
-abstract class ArtifactDetailsState with _$ArtifactDetailsState {
-  const factory ArtifactDetailsState.loading() = _LoadingState;
+abstract class ArtifactState with _$ArtifactState {
+  const factory ArtifactState.loading() = _LoadingState;
 
-  const factory ArtifactDetailsState.loaded({
+  const factory ArtifactState.loaded({
     @required String name,
     @required String image,
     @required int rarityMin,
diff --git a/lib/application/artifact_details/artifact_details_event.dart b/lib/application/artifact_details/artifact_details_event.dart
deleted file mode 100644
index 485f20f0d..000000000
--- a/lib/application/artifact_details/artifact_details_event.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-part of 'artifact_details_bloc.dart';
-
-@freezed
-abstract class ArtifactDetailsEvent with _$ArtifactDetailsEvent {
-  const factory ArtifactDetailsEvent.loadArtifact({
-    @required String key,
-  }) = _LoadArtifact;
-}
diff --git a/lib/application/bloc.dart b/lib/application/bloc.dart
index d8cb8c657..81ed67a1e 100644
--- a/lib/application/bloc.dart
+++ b/lib/application/bloc.dart
@@ -1,4 +1,4 @@
-export 'artifact_details/artifact_details_bloc.dart';
+export 'artifact/artifact_bloc.dart';
 export 'artifacts/artifacts_bloc.dart';
 export 'calculator_asc_materials/calculator_asc_materials_bloc.dart';
 export 'calculator_asc_materials_item/calculator_asc_materials_item_bloc.dart';
diff --git a/lib/infrastructure/telemetry/flutter_appcenter_bundle.dart b/lib/infrastructure/telemetry/flutter_appcenter_bundle.dart
index 3775c5be3..8c2669098 100644
--- a/lib/infrastructure/telemetry/flutter_appcenter_bundle.dart
+++ b/lib/infrastructure/telemetry/flutter_appcenter_bundle.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 const _methodChannelName = 'com.github.wolfteam.genshindb';
@@ -32,7 +31,6 @@ class AppCenter {
       return;
     }
 
-    WidgetsFlutterBinding.ensureInitialized();
     await configureAnalyticsAsync(enabled: enableAnalytics);
     await configureCrashesAsync(enabled: enableCrashes);
 
diff --git a/lib/main.dart b/lib/main.dart
index fc78d9431..e6744951f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -11,6 +11,8 @@ import 'injection.dart';
 import 'presentation/app_widget.dart';
 
 Future<void> main() async {
+  //This is required by app center
+  WidgetsFlutterBinding.ensureInitialized();
   await initInjection();
   runApp(MyApp());
 }
@@ -85,7 +87,7 @@ class MyApp extends StatelessWidget {
           create: (ctx) {
             final genshinService = getIt<GenshinService>();
             final telemetryService = getIt<TelemetryService>();
-            return ArtifactDetailsBloc(genshinService, telemetryService);
+            return ArtifactBloc(genshinService, telemetryService);
           },
         ),
         BlocProvider(
diff --git a/lib/presentation/artifact/artifact_details_page.dart b/lib/presentation/artifact/artifact_page.dart
similarity index 97%
rename from lib/presentation/artifact/artifact_details_page.dart
rename to lib/presentation/artifact/artifact_page.dart
index 30d23e7d8..56f4cf1f9 100644
--- a/lib/presentation/artifact/artifact_details_page.dart
+++ b/lib/presentation/artifact/artifact_page.dart
@@ -11,7 +11,7 @@ import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/rarity.dart';
 import 'package:genshindb/presentation/shared/styles.dart';
 
-class ArtifactDetailsPage extends StatelessWidget {
+class ArtifactPage extends StatelessWidget {
   final double imgHeight = 350;
 
   @override
@@ -19,7 +19,7 @@ class ArtifactDetailsPage extends StatelessWidget {
     return Scaffold(
       body: SafeArea(
         child: SingleChildScrollView(
-          child: BlocBuilder<ArtifactDetailsBloc, ArtifactDetailsState>(
+          child: BlocBuilder<ArtifactBloc, ArtifactState>(
             builder: (context, state) {
               return state.map(
                 loading: (_) => const Loading(useScaffold: false),
diff --git a/lib/presentation/artifacts/widgets/artifact_card.dart b/lib/presentation/artifacts/widgets/artifact_card.dart
index 93e8d08d8..84cc24af6 100644
--- a/lib/presentation/artifacts/widgets/artifact_card.dart
+++ b/lib/presentation/artifacts/widgets/artifact_card.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:genshindb/application/bloc.dart';
 import 'package:genshindb/domain/models/models.dart';
-import 'package:genshindb/presentation/artifact/artifact_details_page.dart';
+import 'package:genshindb/presentation/artifact/artifact_page.dart';
 import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
 import 'package:genshindb/presentation/shared/gradient_card.dart';
 import 'package:genshindb/presentation/shared/rarity.dart';
@@ -85,8 +85,8 @@ class ArtifactCard extends StatelessWidget {
   }
 
   Future<void> _gotoDetailPage(BuildContext context) async {
-    context.read<ArtifactDetailsBloc>().add(ArtifactDetailsEvent.loadArtifact(key: keyName));
-    final route = MaterialPageRoute(builder: (ctx) => ArtifactDetailsPage());
+    context.read<ArtifactBloc>().add(ArtifactEvent.loadArtifact(key: keyName));
+    final route = MaterialPageRoute(builder: (ctx) => ArtifactPage());
     await Navigator.of(context).push(route);
   }
 }