diff --git a/bin/main.dart b/bin/main.dart
index d6fc23f..008508a 100644
--- a/bin/main.dart
+++ b/bin/main.dart
@@ -1,8 +1,8 @@
 import 'dart:core';
 
-import 'package:funkblubber/funkblubber.dart' as funkblubber;
+import 'package:funkblubber/funkwhale.dart' as funkblubber;
 import 'package:funkblubber/console.dart' as console;
-import 'package:funkblubber/parsing/parser.dart' as parser;
+import 'package:funkblubber/parser.dart' as parser;
 
 void main(final List<String> arguments) async {
   final result = parser.extract(arguments);
diff --git a/lib/funkblubber.dart b/lib/funkwhale.dart
similarity index 100%
rename from lib/funkblubber.dart
rename to lib/funkwhale.dart
diff --git a/lib/parsing/parser.dart b/lib/parser.dart
similarity index 98%
rename from lib/parsing/parser.dart
rename to lib/parser.dart
index 6c5e3d7..33e106f 100644
--- a/lib/parsing/parser.dart
+++ b/lib/parser.dart
@@ -1,12 +1,21 @@
 import 'package:funkblubber/funkentity.dart';
 import 'package:funkblubber/console.dart' as console;
-import 'package:funkblubber/parsing/parsing_stage.dart';
 
 enum Action {
   download,
   upload,
 }
 
+enum ParsingStage {
+  nothing,
+  album,
+  artist,
+  track,
+  path,
+  upload,
+  domain,
+}
+
 class StageResult {
   StageResult({required this.result, required this.stage});
   final ParseResult result;
diff --git a/lib/parsing/parsing_stage.dart b/lib/parsing/parsing_stage.dart
deleted file mode 100644
index 725ba7d..0000000
--- a/lib/parsing/parsing_stage.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-enum ParsingStage {
-  nothing,
-  album,
-  artist,
-  track,
-  path,
-  upload,
-  domain,
-}