diff --git a/bin/pdnsapi_manage b/bin/pdnsapi_manage
deleted file mode 100755
index 079732b..0000000
--- a/bin/pdnsapi_manage
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use local::lib;
-use lib 'lib';
-use lib '../Dancer/lib';
-use Dancer::Test;
-
-use PowerDNS::API::Schema;
-
-my $schema = PowerDNS::API::Schema->new;
-
-my ($user, $password) = @ARGV;
-die "$0 [user] [password]\n" unless $password;
-
-# look for account & update 
-
-my $account = $schema->account->find({ name => $user });
-
-if ($account) {
-    $account->password($password);
-    $account->update;
-    print "Account updated\n";
-}
-else {
-    $schema->account->create({ name => $user, password => $password });
-    print "Account created\n";
-}
diff --git a/lib/Mojolicious/Command/account.pm b/lib/Mojolicious/Command/account.pm
new file mode 100644
index 0000000..583c15f
--- /dev/null
+++ b/lib/Mojolicious/Command/account.pm
@@ -0,0 +1,28 @@
+package Mojolicious::Command::account;
+use Mojo::Base 'Mojo::Command';
+
+has description => "Setup a new user account/password.\n";
+has usage       => "usage: $0 account [username] [password]\n";
+
+sub run {
+    my ($self, $user, $password) = @_;
+
+    die $self->usage unless $user && $password;
+
+    my $schema = $self->app->schema;
+
+    my $account = $schema->account->find({ name => $user });
+
+    if ($account) {
+        $account->password($password);
+        $account->update;
+        print "Account updated\n";
+    }
+    else {
+        $schema->account->create({ name => $user, password => $password });
+        print "Account created\n";
+    }
+
+}
+
+1;
diff --git a/lib/PowerDNS/API.pm b/lib/PowerDNS/API.pm
index 5b5519d..6ef7205 100644
--- a/lib/PowerDNS/API.pm
+++ b/lib/PowerDNS/API.pm
@@ -1,6 +1,5 @@
 package PowerDNS::API;
 use Mojo::Base 'Mojolicious';
-#use PowerDNS::API::Handler::API;
 use PowerDNS::API::Schema;
 use Data::Dump ();
 
@@ -85,7 +84,7 @@ L<http://github.com/devel/PowerDNS-API>
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2011 Ask Bjørn Hansen, all rights reserved.
+Copyright 2011-2012 Ask Bjørn Hansen, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/script/power_dnsapi b/script/powerdns_api
similarity index 100%
rename from script/power_dnsapi
rename to script/powerdns_api