diff --git a/lib/kanimaji/animate_kanji.dart b/lib/animator.dart
similarity index 98%
rename from lib/kanimaji/animate_kanji.dart
rename to lib/animator.dart
index 8364b3e..59da897 100644
--- a/lib/kanimaji/animate_kanji.dart
+++ b/lib/animator.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 import 'dart:math' show min, sqrt, pow;
 
-import '../svg/parser.dart';
-import '../common/point.dart';
+import 'svg/parser.dart';
+import 'point.dart';
 
-import 'bezier_cubic.dart' as bezier_cubic;
+import 'bezier.dart' as bezier;
 import 'package:xml/xml.dart';
 
 double _computePathLength(String path) =>
@@ -67,13 +67,13 @@ extension Funcs on TimingFunction {
   double Function(double) get func => {
     TimingFunction.linear: (double x) => x,
     TimingFunction.ease: (double x) =>
-        bezier_cubic.value(pt1, easeCt1, easeCt2, pt2, x),
+        bezier.value(pt1, easeCt1, easeCt2, pt2, x),
     TimingFunction.easeIn: (double x) =>
-        bezier_cubic.value(pt1, easeInCt1, easeInCt2, pt2, x),
+        bezier.value(pt1, easeInCt1, easeInCt2, pt2, x),
     TimingFunction.easeInOut: (double x) =>
-        bezier_cubic.value(pt1, easeInOutCt1, easeInOutCt2, pt2, x),
+        bezier.value(pt1, easeInOutCt1, easeInOutCt2, pt2, x),
     TimingFunction.easeOut: (double x) =>
-        bezier_cubic.value(pt1, easeOutCt1, easeOutCt2, pt2, x),
+        bezier.value(pt1, easeOutCt1, easeOutCt2, pt2, x),
   }[this]!;
 
   String get name => {
diff --git a/lib/kanimaji/bezier_cubic.dart b/lib/bezier.dart
similarity index 96%
rename from lib/kanimaji/bezier_cubic.dart
rename to lib/bezier.dart
index 17dac50..2372bbe 100644
--- a/lib/kanimaji/bezier_cubic.dart
+++ b/lib/bezier.dart
@@ -1,6 +1,6 @@
 import 'dart:math' as math;
 
-import '../common/point.dart';
+import 'point.dart';
 
 // class Point {
 //   final double x;
@@ -17,9 +17,9 @@ double thrt(double x) =>
 
 double sqrt(double x) => x > 0 ? math.sqrt(x) : 0;
 
-double sq(x) => x * x;
+num sq(num x) => x * x;
 
-double cb(x) => x * x * x;
+num cb(num x) => x * x * x;
 
 /// x(t) = t^3 T + 3t^2(1-t) U + 3t(1-t)^2 V + (1-t)^3 W
 double time(Point pt1, Point ct1, Point ct2, Point pt2, double x) {
diff --git a/lib/kanimaji.dart b/lib/kanimaji.dart
deleted file mode 100644
index 190bacf..0000000
--- a/lib/kanimaji.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-
-/// A Calculator.
-class Calculator {
-  /// Returns [value] plus 1.
-  int addOne(int value) => value + 1;
-}
diff --git a/lib/common/point.dart b/lib/point.dart
similarity index 100%
rename from lib/common/point.dart
rename to lib/point.dart
diff --git a/lib/svg/parser.dart b/lib/svg/parser.dart
index 15a432e..c0609a9 100644
--- a/lib/svg/parser.dart
+++ b/lib/svg/parser.dart
@@ -3,7 +3,7 @@
 /// See https://pypi.org/project/svg.path/ for the original implementation.
 library;
 
-import '../common/point.dart';
+import '../point.dart';
 import 'path.dart';
 
 const _commands = {
diff --git a/lib/svg/path.dart b/lib/svg/path.dart
index 0714c06..a037306 100644
--- a/lib/svg/path.dart
+++ b/lib/svg/path.dart
@@ -8,7 +8,7 @@ import 'dart:math' show sqrt, sin, cos, acos, log, pi;
 
 import 'package:bisection/extension.dart';
 
-import '../common/point.dart';
+import '../point.dart';
 
 num radians(num n) => n * pi / 180;
 num degrees(num n) => n * 180 / pi;
diff --git a/lib/widgets/kanjimaji.dart b/lib/widget.dart
similarity index 100%
rename from lib/widgets/kanjimaji.dart
rename to lib/widget.dart
diff --git a/test/svg/parser_test.dart b/test/svg/parser_test.dart
index 2aa115c..7411ff3 100644
--- a/test/svg/parser_test.dart
+++ b/test/svg/parser_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:kanimaji/common/point.dart';
+import 'package:kanimaji/point.dart';
 import 'package:kanimaji/svg/parser.dart';
 import 'package:kanimaji/svg/path.dart';
 
diff --git a/test/svg/path_test.dart b/test/svg/path_test.dart
index a5bb843..42603c6 100644
--- a/test/svg/path_test.dart
+++ b/test/svg/path_test.dart
@@ -2,7 +2,7 @@
 import 'dart:math' show sqrt, pi;
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:kanimaji/common/point.dart';
+import 'package:kanimaji/point.dart';
 import 'package:kanimaji/svg/path.dart';
 
 // from ..path import CubicBezier, QuadraticBezier, Line, Arc, Move, Close, Path
diff --git a/test/svg/tokenizer_test.dart b/test/svg/tokenizer_test.dart
index d8d1a6c..24f20f2 100644
--- a/test/svg/tokenizer_test.dart
+++ b/test/svg/tokenizer_test.dart
@@ -2,7 +2,7 @@
 // from svg.path import parser
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:kanimaji/common/point.dart';
+import 'package:kanimaji/point.dart';
 import 'package:kanimaji/svg/parser.dart'
     show Command, Token, commandifyPath, parsePath, tokenizePath;