-use lib qw(/var/www/ndawn/code/);
+use lib qw(/var/www/ndawn/);
use CGI qw/:standard/;
use DBI;
use DBD::Pg qw(:pg_types);
-use GD::Graph:lines;
+use GD::Graph::lines;
+
+use BBCode::Parser;
+
+use Mail::Sendmail;
use ND;
use ND::DB;
use ND::Include;
-use ND::Web::AuthHandler;
-use ND::Web::Include;
-use ND::Web::Forum;
-
-use ND::Web::Pages::Main;
-use ND::Web::Pages::AddIntel;
-use ND::Web::Pages::Points;
-use ND::Web::Pages::LaunchConfirmation;
-use ND::Web::Pages::CovOp;
-use ND::Web::Pages::Top100;
-use ND::Web::Pages::DefRequest;
-use ND::Web::Pages::Check;
-use ND::Web::Pages::Raids;
-use ND::Web::Pages::EditRaid;
-use ND::Web::Pages::Calls;
-use ND::Web::Pages::Users;
-use ND::Web::Pages::Intel;
-use ND::Web::Pages::Alliances;
-use ND::Web::Pages::MemberIntel;
-use ND::Web::Pages::Resources;
-use ND::Web::Pages::PlanetNaps;
-use ND::Web::Pages::Motd;
-use ND::Web::Pages::Forum;
-use ND::Web::Pages::Settings;
-use ND::Web::Pages::Graph;
+use NDWeb::AuthHandler;
+use NDWeb::Include;
+use NDWeb::Forum;
+use NDWeb::Graph;
+
+use NDWeb::Page;
+use NDWeb::Image;
+use NDWeb::XMLPage;
+
+use NDWeb::Pages::Main;
+use NDWeb::Pages::AddIntel;
+use NDWeb::Pages::Points;
+use NDWeb::Pages::LaunchConfirmation;
+use NDWeb::Pages::CovOp;
+use NDWeb::Pages::PlanetRankings;
+use NDWeb::Pages::DefRequest;
+use NDWeb::Pages::Check;
+use NDWeb::Pages::Raids;
+use NDWeb::Pages::EditRaid;
+use NDWeb::Pages::Calls;
+use NDWeb::Pages::Users;
+use NDWeb::Pages::Intel;
+use NDWeb::Pages::Alliances;
+use NDWeb::Pages::MemberIntel;
+use NDWeb::Pages::Resources;
+use NDWeb::Pages::PlanetNaps;
+use NDWeb::Pages::Motd;
+use NDWeb::Pages::Forum;
+use NDWeb::Pages::Settings;
+use NDWeb::Pages::Graph;
+use NDWeb::Pages::Mail;
+use NDWeb::Pages::HostileAlliances;
+use NDWeb::Pages::AllianceRankings;
+use NDWeb::Pages::GalaxyRankings;
+use NDWeb::Pages::TargetList;
+use NDWeb::Pages::DefLeeches;