diff --git a/Makefile b/Makefile
index 6520f74..43d1e44 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ else
 endif
 
 docs:	documentation
-documentation: phpdoc apigen
+documentation: phpdoc
 
 phpdoc:
 	# Using PHPDocumentor which wirks with phpdocx.dist.xml
@@ -72,7 +72,7 @@ phpdoc:
 
 apigen:
 	# Using ApiGen which works with apigen.neon file for configuration
-	apigen
+	apigen generate
 
 code:
 	php phptidy/phptidy.php replace
diff --git a/admin/account.php b/admin/account.php
index ab72aab..59a7ca9 100644
--- a/admin/account.php
+++ b/admin/account.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $account_id = htmlspecialchars($_REQUEST['id']);
diff --git a/admin/accounts.php b/admin/accounts.php
index c8544b5..4094b52 100644
--- a/admin/accounts.php
+++ b/admin/accounts.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $ADMIN_SECTION = 'accounts';
@@ -128,7 +130,6 @@
 			?><li class="previous"><a href="?page=<?php
 		echo $pagenumber - 1;
 		echo is_null($search) ? '' : '&q=' . urlencode($search);
-		echo $sortby == 'activity' ? '&sort=activity' : '';
 			?>">&larr; prev</a></li><?php
 							} else {
 			?><li class="previous disabled"><a href="#">&larr; prev</a></li><?php
@@ -140,7 +141,6 @@
 			?><li class="next"><a href="?page=<?php
 		echo $pagenumber + 1;
 		echo is_null($search) ? '' : '&q=' . urlencode($search);
-		echo $sortby == 'activity' ? '&sort=activity' : '';
 			?>">next &rarr;</a></li><?php
 						} else {
 			?><li class="next disabled"><a href="#">next &rarr;</a></li><?php }
diff --git a/admin/activity.php b/admin/activity.php
index d786977..67c8f24 100644
--- a/admin/activity.php
+++ b/admin/activity.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 $ADMIN_SECTION = 'activity';
diff --git a/admin/add_account_users.php b/admin/add_account_users.php
index 93beac7..cbad68b 100644
--- a/admin/add_account_users.php
+++ b/admin/add_account_users.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 /**
diff --git a/admin/admin.php b/admin/admin.php
index f406822..f203b90 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(dirname(__DIR__).'/users.php');
 
 UserTools::preventCSRF();
diff --git a/admin/adminMenus.php b/admin/adminMenus.php
deleted file mode 100644
index 190a6f8..0000000
--- a/admin/adminMenus.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-
-/**
- * Abstract class representing the menu hierarchy elements
- *
- * Subclasses will represent particular levels of this hierarchy that behave differently
- *
- * @package StartupAPI
- * @subpackage Admin
- *
- * @todo Add disabling sections of menus altogether
- */
-abstract class MenuElement {
-
-	/**
-	 * @var string String that separates menu sections in the title of the page
-	 */
-	protected static $titleSeparator = ' / ';
-
-	/**
-	 * @var string Menu slug to be used to identify this particular menu element
-	 */
-	protected $slug;
-
-	/**
-	 * @var string Menu element display name
-	 */
-	protected $title;
-
-	/**
-	 * @var string Menu link for those elements that are clickable
-	 */
-	protected $link;
-
-	/**
-	 * @var MenuElement[] An array of child elements for elements that support children
-	 */
-	protected $sub_menus = array();
-
-	/**
-	 * @var string Icon slug
-	 */
-	protected $icon;
-
-	/**
-	 * @var boolean Whatever menu item is currently selected
-	 */
-	protected $active;
-
-	/**
-	 * @var boolean Whatever menu item is enabled or disabled
-	 */
-	protected $enabled;
-
-	/**
-	 * @var string Message to display if menu item is disabled
-	 */
-	protected $disabled_message;
-
-	/**
-	 * Creates a menu item
-	 *
-	 * Subclasses can call this constructor with subset of parameters they support
-	 *
-	 * @param string $slug Slug
-	 * @param string $title Menu title
-	 * @param string $link Menu link
-	 * @param MenuElement[] $sub_menus
-	 * @param string $icon Twitter Bootstrap icon slug
-	 * @param boolean $enabled Enabled / disabled
-	 * @param string $disabled_message Message to display in tooltip on disabled menu
-	 */
-	public function __construct($slug, $title, $link, $sub_menus = null, $icon = null, $enabled = true, $disabled_message = 'Coming soon') {
-		$this->slug = $slug;
-		$this->title = $title;
-		$this->link = $link;
-		$this->sub_menus = $sub_menus;
-		$this->icon = $icon;
-		$this->enabled = $enabled;
-		$this->disabled_message = $disabled_message;
-	}
-
-	/**
-	 * Renders menu item in HTML
-	 *
-	 * Implementations should render their own tags and call submenu's
-	 * renderChildren() function where supported
-	 */
-	abstract public function render();
-
-	/**
-	 * Renders children elements
-	 */
-	public function renderChildren() {
-		foreach ($this->sub_menus as $menu) {
-			$menu->render();
-		}
-	}
-
-	/**
-	 * Sets currently active menu elements based on a slug
-	 *
-	 * @param string $active_slug Slug of active menu element
-	 *
-	 * @return boolean Returns true if child is active so parent can also set itself to active state
-	 */
-	public function setActive($active_slug) {
-		if ($this->matchSlug($active_slug)) {
-			$this->active = true;
-
-			return true;
-		} else if (is_array($this->sub_menus)) {
-			foreach ($this->sub_menus as $menu) {
-				$this->active = $menu->setActive($active_slug);
-
-				if ($this->active) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Compares passed slug to this menu element's slug
-	 *
-	 * Primarily to be overriden in the root element that is not supposed to be matched
-	 *
-	 * @param string $slug Slug to match
-	 *
-	 * @return boolean Returns true if slugs match
-	 */
-	public function matchSlug($slug) {
-		return $this->slug == $slug;
-	}
-
-	/**
-	 * Renders top navigation bar element for this menu item
-	 */
-	public function renderTopNav() {
-
-	}
-
-	/**
-	 * Renders breadcrumbs for the node
-	 *
-	 * @param string $extra Extra string to attach to the end of breadcrumbs
-	 */
-	abstract public function renderBreadCrumbs($extra = null);
-
-	/**
-	 * Renders portion of page title for this menu element
-	 *
-	 * @param string $extra Extra item to be appended at the end
-	 */
-	public function renderTitle($extra = null) {
-		if ($this->active) {
-			echo self::$titleSeparator . $this->title;
-		}
-
-		if (!is_null($this->sub_menus) && is_array($this->sub_menus) && count($this->sub_menus) > 0) {
-			foreach ($this->sub_menus as $menu) {
-				$menu->renderTitle($extra);
-			}
-		}
-	}
-
-}
-
-/**
- * Root element for admin UI menus
- *
- * @package StartupAPI
- * @subpackage Admin
- */
-class AdminMenu extends MenuElement {
-
-	/**
-	 * Creates a root element for admin menu, accepts only array of subelements
-	 *
-	 * @param MenuElement[] $sub_menus
-	 */
-	public function __construct($sub_menus = null) {
-		parent::__construct('admin', 'Admin', null, $sub_menus);
-	}
-
-	public function render() {
-		?><ul class="nav nav-list"><?php
-		$this->renderChildren();
-		?></ul><?php
-	}
-
-	public function matchSlug($slug) {
-		return false;
-	}
-
-	public function renderTopNav() {
-		foreach ($this->sub_menus as $menu) {
-			?><ul class="nav"><?php
-			$menu->renderTopNav();
-			?></ul><?php
-		}
-	}
-
-	public function renderBreadCrumbs($extra = null) {
-		?><ul class="breadcrumb"><?php
-		foreach ($this->sub_menus as $menu) {
-			$menu->renderBreadCrumbs($extra);
-		}
-
-		if (!is_null($extra)) {
-			?><li class="active"><span class="divider"> / </span><?php echo $extra ?></li><?php
-		}
-	}
-
-	public function renderTitle($extra = null) {
-		parent::renderTitle($extra);
-
-		if (!is_null($extra)) {
-			echo self::$titleSeparator . $extra;
-		}
-	}
-
-}
-
-/**
- * Menu section that holds multiple menus
- *
- * @package StartupAPI
- * @subpackage Admin
- */
-class MenuSection extends MenuElement {
-
-	public function render() {
-		?><li class="nav-header"> <?php echo $this->title ?></li><?php
-		$this->renderChildren();
-		?><li class="divider"></li><?php
-	}
-
-	public function renderTopNav() {
-		$enabled = false;
-		foreach ($this->sub_menus as $menu) {
-			if ($menu->enabled) {
-				$enabled = true;
-			}
-		}
-		$this->enabled = $enabled;
-
-		if (!$this->enabled) {
-			return;
-		}
-
-		if ($this->enabled) {
-			if (is_null($this->sub_menus)) {
-				$link = $this->link;
-			} else if (count($this->sub_menus) > 0) {
-				$link = $this->sub_menus[0]->link;
-			} else {
-				return;
-			}
-			?>
-			<li<?php if ($this->active) { ?> class="active"<?php } ?>>
-				<?php if (!is_null($link)) { ?>
-					<a href="<?php echo $link ?>">
-						<?php echo $this->title ?>
-					</a>
-					<?php
-				} else {
-					echo $this->title;
-				}
-				?>
-			</li>
-			<?php
-		} else {
-			?>
-			<li class="disabled">
-				<a href="#" class="disabled">
-					<?php echo $this->title; ?>
-				</a>
-			</li>
-			<?php
-		}
-	}
-
-	public function renderBreadCrumbs($extra = null) {
-		if ($this->active) {
-			if (is_null($this->sub_menus)) {
-				$link = $this->link;
-			} else if (count($this->sub_menus) > 0) {
-				$link = $this->sub_menus[0]->link;
-			}
-			?>
-			<li>
-				<?php if (!is_null($link)) { ?>
-					<a href="<?php echo $link ?>">
-						<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
-						<?php echo $this->title ?>
-					</a>
-					<?php
-				} else {
-					if (!is_null($this->icon)) {
-						?>
-						<i class="icon-<?php echo $this->icon ?>"></i>
-						<?php
-					}
-					echo $this->title;
-				}
-
-				if (is_array($this->sub_menus)) {
-					?><span class="divider">/</span><?php
-			}
-				?>
-			</li>
-			<?php
-			foreach ($this->sub_menus as $menu) {
-				$menu->renderBreadCrumbs($extra);
-			}
-		}
-	}
-
-}
-
-/**
- * Leaf menu item without subitems
- *
- * @package StartupAPI
- * @subpackage Admin
- */
-class Menu extends MenuElement {
-
-	/**
-	 * Creates a leaf menu item
-	 *
-	 * @param string $slug Slug
-	 * @param string $title Menu title
-	 * @param string $link Menu link
-	 * @param string $icon Twitter Bootstrap icon slug
-	 * @param boolean $enabled Enabled / disabled
-	 * @param string $disabled_message Message to display in tooltip on disabled menu
-	 */
-	public function __construct($slug, $title, $link, $icon = null, $enabled = true, $disabled_message = 'Coming soon') {
-		parent::__construct($slug, $title, $link, null, $icon, $enabled, $disabled_message);
-	}
-
-	public function render() {
-		if (is_null($this->link)) {
-			return;
-		}
-		if ($this->enabled) {
-			?>
-			<li<?php if ($this->active) { ?> class="active"<?php } ?>>
-				<a href="<?php echo $this->link ?>">
-					<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
-					<?php echo $this->title ?>
-				</a>
-			</li>
-			<?php
-		} else {
-			?>
-			<li class="disabled"<?php if (!is_null($this->disabled_message)) { ?> title="<?php echo $this->disabled_message ?>"<?php } ?>>
-				<a href="#">
-					<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
-					<?php echo $this->title ?>
-				</a>
-			</li>
-			<?php
-		}
-	}
-
-	public function renderTopNav() {
-		if (!$this->enabled) {
-			return;
-		}
-		?>
-		<li<?php if ($this->active) { ?> class="active"<?php } ?>>
-			<a href="<?php echo $this->link ?>">
-				<?php echo $this->title ?>
-			</a>
-		</li>
-		<?php
-	}
-
-	public function renderBreadCrumbs($extra = null) {
-		if ($this->active) {
-			if (is_null($extra)) {
-				?><li class="active"><?php echo $this->title ?></li><?php
-			} else {
-				if (is_null($this->sub_menus)) {
-					$link = $this->link;
-				} else if (count($this->sub_menus) > 0) {
-					$link = $this->sub_menus[0]->link;
-				}
-				?>
-				<li class="active">
-					<?php if (!is_null($link)) { ?>
-						<a href="<?php echo $link ?>">
-							<?php echo $this->title ?>
-						</a>
-						<?php
-					} else {
-						echo $this->title;
-					}
-					?>
-				</li>
-				<?php
-			}
-		}
-	}
-
-}
diff --git a/admin/admin_access_only.php b/admin/admin_access_only.php
index 0d01be3..92cf54f 100644
--- a/admin/admin_access_only.php
+++ b/admin/admin_access_only.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(UserConfig::$header);
 
 ?><h2>Access Denied</h2>
diff --git a/admin/badge.php b/admin/badge.php
index 9c497ba..6d811a5 100644
--- a/admin/badge.php
+++ b/admin/badge.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 if (!array_key_exists('id', $_GET) || is_null($badge = Badge::getByID($_GET['id']))) {
diff --git a/admin/badges.php b/admin/badges.php
index e710342..c648956 100644
--- a/admin/badges.php
+++ b/admin/badges.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $ADMIN_SECTION = 'badges';
diff --git a/admin/bymodule.php b/admin/bymodule.php
index 2d12c35..c3bc2b3 100644
--- a/admin/bymodule.php
+++ b/admin/bymodule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 $ADMIN_SECTION = 'bymodule';
diff --git a/admin/campaigns.php b/admin/campaigns.php
index 7b10d27..69b49bf 100644
--- a/admin/campaigns.php
+++ b/admin/campaigns.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $ADMIN_SECTION = 'campaigns';
diff --git a/admin/cohorts.php b/admin/cohorts.php
index 6369cd2..398852d 100644
--- a/admin/cohorts.php
+++ b/admin/cohorts.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * @package StartupAPI
  * @subpackage Analytics\CohortAnalysis
diff --git a/admin/edit_account.php b/admin/edit_account.php
index 5d5d4e3..d73de65 100644
--- a/admin/edit_account.php
+++ b/admin/edit_account.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $account_id = $_GET['id'];
diff --git a/admin/features.php b/admin/features.php
index 7528ec2..c5c67ab 100644
--- a/admin/features.php
+++ b/admin/features.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 $ADMIN_SECTION = 'features';
@@ -112,7 +114,7 @@
 </table>
 <?php
 } else {
-	?><div style="text-align: center; padding: 2em">No <a href="http://startupapi.org/StartupAPI/FeatureManagement" target="_blank">features</a> defined in this application</div><?php
+	?><div style="text-align: center; padding: 2em">No <a href="https://github.com/StartupAPI/users/wiki/Feature-Management" target="_blank">features</a> defined in this application</div><?php
 }
 
 ?>
diff --git a/admin/footer.php b/admin/footer.php
index 44c8e14..9ff3cf4 100644
--- a/admin/footer.php
+++ b/admin/footer.php
@@ -1,4 +1,6 @@
-<!-- admin footer starts -->
+<?php
+namespace StartupAPI;
+?><!-- admin footer starts -->
 			</div>
 		</div>
 		<footer class="footer startupapi-admin-footer navbar-inner">
diff --git a/admin/header.php b/admin/header.php
index 501667d..f852a9c 100644
--- a/admin/header.php
+++ b/admin/header.php
@@ -1,7 +1,7 @@
 <?php
+namespace StartupAPI;
+
 require_once(dirname(__DIR__) . '/global.php');
-require_once(dirname(__DIR__) . '/classes/User.php');
-require_once(__DIR__ . '/adminMenus.php');
 
 $current_user = User::require_login(false);
 
@@ -30,38 +30,38 @@
 
 $features_num = count(Feature::getAll());
 
-$admin_menu = new AdminMenu(array(
-			new Menu('home', 'Home', $ADMIN_ROOT . '/', 'home'),
+$admin_menu = new Admin\AdminMenu(array(
+			new Admin\Menu('home', 'Home', $ADMIN_ROOT . '/', 'home'),
 			/*
 			  new menuSection('dashboards', 'Dashboards', array(
 			  new menu('basic', 'Basic Metrics', $ADMIN_ROOT . '/', 'signal')
 			  )),
 			 */
-			new MenuSection('users', 'Users', null, array(
-				new Menu('activity', 'Activity', $ADMIN_ROOT . '/activity.php', 'signal'),
-				new Menu('plans', 'Service Plans', null, 'folder-open'),
-				new Menu('registrations', 'Registered Users', $ADMIN_ROOT . '/users.php', 'user'),
-				new Menu('cohorts', 'Cohort Analysis', $ADMIN_ROOT . '/cohorts.php', 'th'),
-				new Menu('bymodule', 'Registrations By Module', $ADMIN_ROOT . '/bymodule.php', 'th-large'),
-				new Menu('invitations', 'Invitations', $ADMIN_ROOT . '/invitations.php', 'envelope', UserConfig::$adminInvitationOnly, 'Invitations are disabled in configuration'),
-				new Menu('accounts', 'Accounts', $ADMIN_ROOT . '/accounts.php', 'folder-open'),
+			new Admin\MenuSection('users', 'Users', null, array(
+				new Admin\Menu('activity', 'Activity', $ADMIN_ROOT . '/activity.php', 'signal'),
+				new Admin\Menu('plans', 'Service Plans', null, 'folder-open'),
+				new Admin\Menu('registrations', 'Registered Users', $ADMIN_ROOT . '/users.php', 'user'),
+				new Admin\Menu('cohorts', 'Cohort Analysis', $ADMIN_ROOT . '/cohorts.php', 'th'),
+				new Admin\Menu('bymodule', 'Registrations By Module', $ADMIN_ROOT . '/bymodule.php', 'th-large'),
+				new Admin\Menu('invitations', 'Invitations', $ADMIN_ROOT . '/invitations.php', 'envelope', UserConfig::$adminInvitationOnly, 'Invitations are disabled in configuration'),
+				new Admin\Menu('accounts', 'Accounts', $ADMIN_ROOT . '/accounts.php', 'folder-open'),
 			)),
-			new MenuSection('money', 'Money', null, array(
-				new Menu('outstanding', 'Outstanding charges', $ADMIN_ROOT . '/outstanding.php', 'certificate', UserConfig::$useSubscriptions, 'Subscriptions are disabled in configuration'),
-				new Menu('transactions', 'Transactions', null, 'list', UserConfig::$useSubscriptions),
-				new Menu('payment_method', 'Payment methods', null, 'th-large', UserConfig::$useSubscriptions)
+			new Admin\MenuSection('money', 'Money', null, array(
+				new Admin\Menu('outstanding', 'Outstanding charges', $ADMIN_ROOT . '/outstanding.php', 'certificate', UserConfig::$useSubscriptions, 'Subscriptions are disabled in configuration'),
+				new Admin\Menu('transactions', 'Transactions', null, 'list', UserConfig::$useSubscriptions),
+				new Admin\Menu('payment_method', 'Payment methods', null, 'th-large', UserConfig::$useSubscriptions)
 					), null, UserConfig::$useSubscriptions),
-			new MenuSection('promotion', 'Promotion', null, array(
-				new Menu('sources', 'Sources', $ADMIN_ROOT . '/sources.php', 'random'),
-				new Menu('campaigns', 'Campaign management', $ADMIN_ROOT . '/campaigns.php', 'comment')
+			new Admin\MenuSection('promotion', 'Promotion', null, array(
+				new Admin\Menu('sources', 'Sources', $ADMIN_ROOT . '/sources.php', 'random'),
+				new Admin\Menu('campaigns', 'Campaign management', $ADMIN_ROOT . '/campaigns.php', 'comment')
 			)),
-			new MenuSection('gamification', 'Gamification', null, array(
-				new Menu('badges', 'Badges', $ADMIN_ROOT . '/badges.php', 'star')
+			new Admin\MenuSection('gamification', 'Gamification', null, array(
+				new Admin\Menu('badges', 'Badges', $ADMIN_ROOT . '/badges.php', 'star')
 			)),
-			new MenuSection('settings', 'Settings', null, array(
-				new Menu('systemsettings', 'System Settings', $ADMIN_ROOT . '/settings.php', 'wrench'),
-				new Menu('modules', 'Modules', $ADMIN_ROOT . '/modules.php', 'th-large'),
-				new Menu('features', 'Features', $ADMIN_ROOT . '/features.php', 'check', $features_num > 0, 'No features defined in this app')
+			new Admin\MenuSection('settings', 'Settings', null, array(
+				new Admin\Menu('systemsettings', 'System Settings', $ADMIN_ROOT . '/settings.php', 'wrench'),
+				new Admin\Menu('modules', 'Modules', $ADMIN_ROOT . '/modules.php', 'th-large'),
+				new Admin\Menu('features', 'Features', $ADMIN_ROOT . '/features.php', 'check', $features_num > 0, 'No features defined in this app')
 			))
 		));
 
diff --git a/admin/index.php b/admin/index.php
index 6272017..66057e9 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $ADMIN_SECTION = 'home';
diff --git a/admin/invitations.php b/admin/invitations.php
index dc27745..ebac875 100644
--- a/admin/invitations.php
+++ b/admin/invitations.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $user = User::require_login();
diff --git a/admin/modules.php b/admin/modules.php
index 45ca228..c1042e5 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -1,97 +1,19 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 // temporary switch to make it easy to see experimental modules
-$show_experimental = true;
-
-$module_categories = array(
-	'auth' => array(
-		'title' => 'Authentication modules'
-	),
-	'email' => array(
-		'title' => 'Email module'
-	),
-	'payment' => array(
-		'title' => 'Payment engines'
-	)
-);
-
-$builtin_modules = array(
-	'usernamepass' => array(
-		'class' => 'UsernamePasswordAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'email' => array(
-		'class' => 'EmailAuthenticationModule',
-		'experimental' => true,
-		'category_slug' => 'auth'
-	),
-	'facebook' => array(
-		'class' => 'FacebookAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'twitter' => array(
-		'class' => 'TwitterAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'google_oauth' => array(
-		'class' => 'GoogleOAuthAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'linkedin' => array(
-		'class' => 'LinkedInAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'meetup' => array(
-		'class' => 'MeetupAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'etsy' => array(
-		'class' => 'EtsyAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'foursquare' => array(
-		'class' => 'FoursquareAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'github' => array(
-		'class' => 'GithubAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'ohloh' => array(
-		'class' => 'OhlohAuthenticationModule',
-		'category_slug' => 'auth'
-	),
-	'mailchimp' => array(
-		'class' => 'MailChimpModule',
-		'experimental' => true,
-		'category_slug' => 'email'
-	),
-	'manual' => array(
-		'class' => 'ManualPaymentEngine',
-		'experimental' => true,
-		'category_slug' => 'payment'
-	),
-	'external_payment' => array(
-		'class' => 'ExternalPaymentEngine',
-		'experimental' => true,
-		'category_slug' => 'payment'
-	),
-	'stripe' => array(
-		'class' => 'StripePaymentEngine',
-		'experimental' => true,
-		'category_slug' => 'payment'
-	),
-);
+$show_experimental = array_key_exists('experimental', $_GET);
 
 $ADMIN_SECTION = 'modules';
 require_once(__DIR__ . '/header.php');
 ?>
 <div class="span9">
 	<?php
-	foreach ($module_categories as $category_slug => $module_category) {
+	foreach (StartupAPIModule::$module_categories as $category_slug => $module_category) {
 		$category_modules = array();
-		foreach ($builtin_modules as $module_slug => $module) {
+		foreach (StartupAPIModule::$builtin_modules as $module_slug => $module) {
 			if ($module['category_slug'] == $category_slug && ($show_experimental || !array_key_exists('experimental', $module) || !$module['experimental'])
 			) {
 				$category_modules[$module_slug] = $module;
@@ -106,7 +28,7 @@
 		foreach ($category_modules as $module_slug => $module) {
 			$instances = array();
 			foreach (UserConfig::$all_modules as $installed_module) {
-				if (get_class($installed_module) == $module['class']) {
+				if (get_class($installed_module) == 'StartupAPI\\Modules\\' . $module['class']) {
 					$instances[] = $installed_module;
 				}
 			}
@@ -117,7 +39,7 @@
 				/*
 				 * Ignore experimental modules that are not installed
 				 */
-				if (!array_key_exists('experimental', $module) || !$module['experimental']) {
+				if ($show_experimental || !array_key_exists('experimental', $module) || !$module['experimental']) {
 					$not_installed_modules[$module_slug] = $module;
 				}
 			}
@@ -138,12 +60,10 @@
 			foreach ($category_modules as $module_slug => $module) {
 				?>
 				<?php
-				UserConfig::loadModule($module_slug);
-
 				$instances = array();
 				foreach (UserConfig::$all_modules as $installed_module) {
 					// checking if this built-in module was ever instantiated
-					if (get_class($installed_module) == $module['class']) {
+					if (get_class($installed_module) == 'StartupAPI\\Modules\\' . $module['class']) {
 						$instances[] = $installed_module;
 					}
 				}
@@ -191,7 +111,7 @@
 					?>
 					<div class="well well-small startupapi-module startupapi-module-not-installed">
 						<?php
-						$class = $module['class'];
+						$class = '\\StartupAPI\\Modules\\' . $module['class'];
 
 						// getting info from the class
 						$logo = $class::getModulesLogo(100);
diff --git a/admin/new_account.php b/admin/new_account.php
index b466ca3..e25be97 100644
--- a/admin/new_account.php
+++ b/admin/new_account.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 if (array_key_exists('account_name', $_POST)) {
diff --git a/admin/outstanding.php b/admin/outstanding.php
index e71aa93..04abc7a 100644
--- a/admin/outstanding.php
+++ b/admin/outstanding.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 /* ------------------- Preparing data for template ------------------------------------- */
@@ -6,15 +8,15 @@
 $db = UserConfig::getDB();
 
 if (!($stmt = $db->prepare('SELECT a.id, a.name, a.plan_slug, a.schedule_slug, SUM(c.amount) AS debt FROM u_accounts AS a JOIN u_account_charge AS c ON a.id = c.account_id GROUP BY c.account_id HAVING debt < 0'))) {
-	throw new DBPrepareStmtException($db);
+	throw new Exceptions\DBPrepareStmtException($db);
 }
 
 if (!$stmt->execute()) {
-	throw new DBExecuteStmtException($db, $stmt);
+	throw new Exceptions\DBExecuteStmtException($db, $stmt);
 }
 
 if (!$stmt->bind_result($id, $name, $plan, $schedule, $debt)) {
-	throw new DBBindResultException($db, $stmt);
+	throw new Exceptions\DBBindResultException($db, $stmt);
 }
 
 $debtors = array();
diff --git a/admin/plan.php b/admin/plan.php
index 06ced8a..d0295d2 100644
--- a/admin/plan.php
+++ b/admin/plan.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 if (!array_key_exists('slug', $_GET)) {
diff --git a/admin/settings.inc b/admin/settings.inc
index 6060ab6..0450f03 100644
--- a/admin/settings.inc
+++ b/admin/settings.inc
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * A full list of settings available in the system, must be in sync with
@@ -11,41 +12,16 @@ $config_variables = array(
 		'groups' => array(
 			array(
 				'settings' => array(
-					array(
-						'description' => 'MySQL host',
-						'type' => 'string',
-						'name' => 'mysql_host'
-					),
-					array(
-						'description' => 'MySQL port',
-						'type' => 'int',
-						'name' => 'mysql_port'
-					),
-					array(
-						'description' => 'MySQL socket',
-						'type' => 'path',
-						'name' => 'mysql_socket'
-					),
-					array(
-						'description' => 'MySQL database name',
-						'type' => 'string',
-						'name' => 'mysql_db'
-					),
-					array(
-						'description' => 'MySQL database user. See access permissions requirements at http://StartupAPI.org/StartupAPI/DB_privileges',
-						'type' => 'string',
-						'name' => 'mysql_user'
-					),
-					array(
-						'description' => 'MySQL password',
-						'type' => 'secret',
-						'name' => 'mysql_password'
-					),
-					array(
-						'description' => "MySQL table prefix for all StartupAPI tables ('u_' by default)",
-						'type' => 'string',
-						'name' => 'mysql_prefix'
-					)
+					new Setting(Setting::TYPE_STRING,'mysql_host', 'MySQL host'),
+					new Setting(Setting::TYPE_INT,'mysql_port', 'MySQL port'),
+					new Setting(Setting::TYPE_PATH,'mysql_socket', 'MySQL socket'),
+					new Setting(Setting::TYPE_STRING,'mysql_db', 'MySQL database name'),
+					new Setting(
+						Setting::TYPE_STRING,
+						'mysql_user',
+						'MySQL database user. See access permissions requirements at https://github.com/StartupAPI/users/wiki/Installation#create-mysql-database'
+					),
+					new Setting(Setting::TYPE_SECRET,'mysql_password', 'MySQL password')
 				)
 			)
 		)
@@ -56,10 +32,10 @@ $config_variables = array(
 		'groups' => array(
 			array(
 				'settings' => array(
-					array(
-						'description' => 'Array of integer IDs for site administrators (who have access to adin UI)',
-						'type' => 'user-id[]',
-						'name' => 'admins'
+					new Setting(
+						Setting::TYPE_USER_ID_ARRAY,
+						'admins',
+						'Array of integer IDs for site administrators (who have access to admin UI)'
 					)
 				)
 			)
@@ -71,17 +47,17 @@ $config_variables = array(
 		'groups' => array(
 			array(
 				'settings' => array(
-					array(
-						'description' => 'Debug messages in log files',
-						'type' => 'boolean',
-						'name' => 'DEBUG',
-						'options' => array('true_string' => 'enabled', 'false_string' => 'disabled')
-					),
-					array(
-						'description' => 'Enable / disable developer tools in the UI',
-						'type' => 'boolean',
-						'name' => 'DEVMODE',
-						'options' => array('true_string' => 'enabled', 'false_string' => 'disabled')
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'DEBUG',
+						'Debug messages in log files',
+						array('true_string' => 'enabled', 'false_string' => 'disabled')
+					),
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'DEVMODE',
+						'Enable / disable developer tools in the UI',
+						array('true_string' => 'enabled', 'false_string' => 'disabled')
 					)
 				)
 			)
@@ -93,91 +69,90 @@ $config_variables = array(
 		'groups' => array(
 			array(
 				'settings' => array(
-					array(
-						'description' => 'Application name',
-						'type' => 'string',
-						'name' => 'appName'
-					),
-					array(
-						'description' => 'Application icon URL (20x20)',
-						'type' => 'string',
-						'name' => 'appIconURL'
-					),
-					array(
-						'description' => 'File system path to maillist management widget file to be included on profile management page.',
-						'type' => 'path',
-						'name' => 'maillist'
-					),
-					array(
-						'description' => 'File system path to admin UI footer HTML file.',
-						'type' => 'path',
-						'name' => 'admin_footer'
-					),
-					array(
-						'description' => 'If specified, StartupAPI::head() will include this Twitter Bootstrap CSS instead of default one',
-						'type' => 'url',
-						'name' => 'bootstrapCSS'
-					),
-					array(
-						'description' => 'If specified, StartupAPI::head() will include this Bootswatch Theme instead of default one',
-						'type' => 'string',
-						'name' => 'bootstrapTheme'
-					),
-					array(
-						'description' => 'Bootstrap themes available',
-						'type' => 'string[]',
-						'name' => 'availableBootstrapThemes'
-					),
-
-					array(
-						'description' => 'If specified, Admin UI will include this Twitter Bootstrap CSS instead of default one',
-						'type' => 'url',
-						'name' => 'bootstrapAdminCSS'
-					),
-					array(
-						'description' => 'Associative array of Twig environment options',
-						'type' => 'array',
-						'name' => 'twig_options'
-					),
+					new Setting(
+						Setting::TYPE_STRING,
+						'appName',
+						'Application name'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'appIconURL',
+						'Application icon URL (20x20)'
+					),
+					new Setting(
+						Setting::TYPE_PATH,
+						'maillist',
+						'File system path to maillist management widget file to be included on profile management page.'
+					),
+					new Setting(
+						Setting::TYPE_PATH,
+						'admin_footer',
+						'File system path to admin UI footer HTML file.'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'bootstrapCSS',
+						'If specified, StartupAPI::head() will include this Twitter Bootstrap CSS instead of default one'
+					),
+					new Setting(
+						Setting::TYPE_STRING,
+						'bootstrapTheme',
+						'If specified, StartupAPI::head() will include this Bootswatch Theme instead of default one'
+					),
+					new Setting(
+						Setting::TYPE_STRING_ARRAY,
+						'availableBootstrapThemes',
+						'Bootstrap themes available'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'bootstrapAdminCSS',
+						'If specified, Admin UI will include this Twitter Bootstrap CSS instead of default one'
+					),
+					new Setting(
+						'array',
+						'twig_options',
+						'Associative array of Twig environment options'
+					)
 				),
 			),
 			array(
 				'description' => 'Power strip menu options',
 				'settings' => array(
-					array(
-						'description' => 'Put power strip in a navbar (disable if you have your own navbar going)',
-						'type' => 'boolean',
-						'name' => 'powerStripShowNavbar'
-					),
-					array(
-						'description' => 'Invert power strip styles',
-						'type' => 'boolean',
-						'name' => 'powerStripInvertedNavbar'
-					),
-					array(
-						'description' => 'Show power strip as Bootstrap nav pills instead of navbar',
-						'type' => 'boolean',
-						'name' => 'powerStripNavPills'
-					),
-					array(
-						'description' => 'Align power strip to the right',
-						'type' => 'boolean',
-						'name' => 'powerStripPullRight'
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'powerStripShowNavbar',
+						'Put power strip in a navbar (disable if you have your own navbar going)'
+					),
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'powerStripInvertedNavbar',
+						'Invert power strip styles'
+					),
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'powerStripNavPills',
+						'Show power strip as Bootstrap nav pills instead of navbar'
+					),
+					new Setting(
+						Setting::TYPE_BOOLEAN,
+						'powerStripPullRight',
+						'Align power strip to the right'
 					)
 				)
 			),
 			array(
-				'description' => 'Themes (under development)',
+				'description' => 'Themes',
 				'settings' => array(
-					array(
-						'description' => 'Array of available theme slugs',
-						'type' => 'string[]',
-						'name' => 'available_themes'
-					),
-					array(
-						'description' => 'Theme slug for current theme',
-						'type' => 'string',
-						'name' => 'theme'
+					new Setting(
+						Setting::TYPE_STRING_ARRAY,
+						'available_themes',
+						'Array of available theme slugs'
+					),
+					new Setting(
+						Setting::TYPE_STRING,
+						'theme',
+						'Theme slug for current theme'
 					)
 				)
 			)
@@ -190,61 +165,61 @@ $config_variables = array(
 			array(
 				'description' => 'These paths are set automatically, so you might not want to modify them',
 				'settings' => array(
-					array(
-						'description' => 'Root path of the project on the file system',
-						'type' => 'path',
-						'name' => 'ROOTPATH'
-					),
-					array(
-						'description' => 'Root URL of Startup API code (relative, e.g. /myapp/users/)',
-						'type' => 'url',
-						'name' => 'USERSROOTURL'
-					),
-					array(
-						'description' => 'Root URL of Startup API code (full, e.g. http://example.com/myapp/users/)',
-						'type' => 'url',
-						'name' => 'USERSROOTFULLURL'
-					),
-					array(
-						'description' => 'Root URL of the application using Startup API (relative, e.g. /myapp/)',
-						'type' => 'url',
-						'name' => 'SITEROOTURL'
-					),
-					array(
-						'description' => 'Root URL of the application using Startup API (full, e.g. http://example.com/myapp/)',
-						'type' => 'url',
-						'name' => 'SITEROOTFULLURL'
-					),
+					new Setting(
+						Setting::TYPE_PATH,
+						'ROOTPATH',
+						'Root path of the project on the file system'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'USERSROOTURL',
+						'Root URL of Startup API code (relative, e.g. /myapp/users/)'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'USERSROOTFULLURL',
+						'Root URL of Startup API code (full, e.g. http://example.com/myapp/users/)'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'SITEROOTURL',
+						'Root URL of the application using Startup API (relative, e.g. /myapp/)'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'SITEROOTFULLURL',
+						'Root URL of the application using Startup API (full, e.g. http://example.com/myapp/)'
+					)
 				)
 			),
 			array(
 				'description' => 'Return URLs can be modified if you want to change where users return after each action',
 				'settings' => array(
-					array(
-						'description' => 'Default location URL to return to upon login',
-						'type' => 'url',
-						'name' => 'DEFAULTLOGINRETURN'
-					),
-					array(
-						'description' => 'Default location URL to return to upon logout',
-						'type' => 'url',
-						'name' => 'DEFAULTLOGOUTRETURN'
-					),
-					array(
-						'description' => 'Default location URL to return to upon registration',
-						'type' => 'url',
-						'name' => 'DEFAULTREGISTERRETURN'
-					),
-					array(
-						'description' => 'Default location URL to return to upon password reset (for username/password auth)',
-						'type' => 'url',
-						'name' => 'DEFAULTUPDATEPASSWORDRETURN'
-					),
-					array(
-						'description' => 'Default location URL to return to upon successful email verification',
-						'type' => 'url',
-						'name' => 'DEFAULT_EMAIL_VERIFIED_RETURN'
-					),
+					new Setting(
+						Setting::TYPE_URL,
+						'DEFAULTLOGINRETURN',
+						'Default location URL to return to upon login'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'DEFAULTLOGOUTRETURN',
+						'Default location URL to return to upon logout'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'DEFAULTREGISTERRETURN',
+						'Default location URL to return to upon registration'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'DEFAULTUPDATEPASSWORDRETURN',
+						'Default location URL to return to upon password reset (for username/password auth)'
+					),
+					new Setting(
+						Setting::TYPE_URL,
+						'DEFAULT_EMAIL_VERIFIED_RETURN',
+						'Default location URL to return to upon successful email verification'
+					)
 				)
 			)
 		)
diff --git a/admin/settings.php b/admin/settings.php
index 44941e3..585452f 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * This page displays current state of the settings in the system
  *
@@ -9,106 +11,6 @@
  */
 require_once(__DIR__ . '/admin.php');
 
-/**
- * Prints PHP value to be included in a code snippen
- *
- * @param string $type PHP variable type: 'boolean', 'int', 'string' and special type 'secret' for variables to not be shown in UI
- * @param mixed $value Value of the variable
- */
-function codeValue($type, $value, $options = array()) {
-	if (substr($type, -2) == '[]' && is_array($value)) {
-		?>array(<?php
-		$first = true;
-		foreach ($value as $val) {
-			if (!$first) {
-				?>, <?php
-			}
-			codeValue(substr($type, 0, -2), $val);
-			$first = false;
-		}
-		?>)<?php
-		return;
-	}
-
-	if (is_null($value)) {
-		?><span class="startupapi-admin-code-value null">null</span><?php
-	} else if ($type == 'boolean') {
-		?><span class="startupapi-admin-code-value boolean"><?php echo $value ? 'true' : 'false' ?></span><?php
-	} else if ($type == 'int' || $type == 'user-id' || $type == 'seconds' || $type == 'minutes') {
-		?><span class="startupapi-admin-code-value int"><?php echo UserTools::escape($value) ?></span><?php
-	} else if ($type == 'secret') {
-		?>'<span class="startupapi-admin-code-value secret" title="Actual value is not shown for security reasons">****************</span>'<?php
-	} else if ($type == 'string' || $type == 'path' || $type == 'url' || $type == 'cookie-key') {
-		?>'<span class="startupapi-admin-code-value string"><?php echo UserTools::escape($value) ?></span>'<?php
-	} else if ($type == 'callable') {
-		if (is_string($value)) {
-			?>'<span class="startupapi-admin-code-value callable"><?php echo UserTools::escape($value) ?></span>'<?php
-		} else if (is_array($value)) {
-			?><span class="startupapi-admin-code-value callable">array('<?php echo UserTools::escape($value[0]) ?>', '<?php echo UserTools::escape($value[1]) ?>')</span><?php
-		} else if (get_class($value) == 'Closure') {
-			$arguments = is_array($options) && array_key_exists('arguments', $options) ? $options['arguments'] : array();
-			$var_names = array_map(function($argument) {
-						return '$' . $argument;
-					}, $arguments);
-			?><span class="startupapi-admin-code-value callable">function(<?php echo join(', ', $var_names) ?>) { &hellip; }</span><?php
-		}
-	} else {
-		?><span class="startupapi-admin-code-value unknown"><?php echo UserTools::escape(var_export($value, true)) ?></span><?php
-	}
-}
-
-/**
- * Prints setting value in a way appropriate for a type of the variable
- *
- * @param string $type Setting type: 'boolean', 'seconds', 'path', 'url', 'secret', 'cookie-key'
- * @param mixed $value Value of the setting
- * @param mixed[] $options Array of additional options that might be needed by some types
- */
-function value($type, $value, $options = array()) {
-	if (is_null($value)) {
-		?><span class="startupapi-admin-setting-value null">&mdash;</span><?php
-	} else if ($type == 'boolean') {
-		$true_string = is_array($options) && array_key_exists('true_string', $options) ? $options['true_string'] : 'yes';
-		$false_string = is_array($options) && array_key_exists('false_string', $options) ? $options['false_string'] : 'no';
-		?><span class="badge<?php echo $value ? ' badge-success' : '' ?>"><?php echo $value ? $true_string : $false_string ?></span><?php
-	} else if ($type == 'seconds') {
-		?><span class="startupapi-admin-setting-value seconds"><?php echo UserTools::escape($value) ?></span> seconds
-		(<?php echo UserTools::escape(intval($value / 60 / 60 / 24)) ?> days)<?php
-	} else if ($type == 'minutes') {
-		?><span class="startupapi-admin-setting-value minutes"><?php echo UserTools::escape($value) ?></span> minutes<?php
-	} else if ($type == 'days') {
-		?><span class="startupapi-admin-setting-value days"><?php echo UserTools::escape($value) ?></span> days<?php
-	} else if ($type == 'path') {
-		?><span class="startupapi-admin-setting-value path"><?php echo UserTools::escape($value) ?></span><?php
-	} else if ($type == 'url') {
-		?><a class="startupapi-admin-setting-value url" target="_blank" href="<?php echo UserTools::escape($value) ?>"><?php echo UserTools::escape($value) ?><i class="icon-share-alt"></i></a><?php
-	} else if ($type == 'secret') {
-		?><span class="startupapi-admin-setting-value secret">hidden</span><?php
-	} else if ($type == 'cookie-key') {
-		?><span class="badge badge-warning"><i class="icon-tags icon-white"></i> <?php echo UserTools::escape($value) ?></span><?php
-	} else if ($type == 'int') {
-		?><span class="startupapi-admin-setting-value int"><?php echo UserTools::escape($value) ?></span><?php
-	} else if ($type == 'string') {
-		?>'<span class="startupapi-admin-setting-value string"><?php echo UserTools::escape($value) ?></span>'<?php
-	} else if ($type == 'callable') {
-		$arguments = is_array($options) && array_key_exists('arguments', $options) ? $options['arguments'] : array();
-		$var_names = array_map(function($argument) {
-					return '$' . $argument;
-				}, $arguments);
-		if (is_string($value)) {
-			?><span class="startupapi-admin-setting-value callable"><?php echo UserTools::escape($value) ?>(<?php echo join(', ', $var_names) ?>)</span><?php
-		} else if (is_array($value)) {
-			?><span class="startupapi-admin-setting-value callable"><?php echo UserTools::escape($value[0]) ?>::<?php echo UserTools::escape($value[1]) ?>(<?php echo join(', ', $var_names) ?>)</span><?php
-		} else if (get_class($value) == 'Closure') {
-			?><span class="startupapi-admin-setting-value callable">function(<?php echo join(', ', $var_names) ?>) { &hellip; }</span><?php
-		}
-	} else if ($type == 'user-id') {
-		?><a href="user.php?id=<?php echo $value ?>"><i class="icon-user"></i> <?php echo UserTools::escape(User::getUser($value)->getName()) ?></a><?php
-	} else {
-		?><pre class="t8-toggle startupapi-admin-setting-value unknown"><?php echo UserTools::escape(var_export($value, true)) ?></pre><?php
-	}
-}
-
 /* Getting $config_variables from settings.inc file */
 require_once(__DIR__ . '/settings.inc');
 
@@ -155,19 +57,20 @@ function value($type, $value, $options = array()) {
 			</tr>
 			<?php
 			foreach ($group['settings'] as $setting) {
-				$var_name = $setting['name'];
+				if (!is_object($setting) || get_class($setting) != 'StartupAPI\Setting') {
+					continue;
+				}
 
-				$code = "";
 				?>
 				<tr class="startupapi-admin-setting">
 					<td>
-						<p><?php echo $setting['description'] ?></p>
+						<h4><?php echo $setting->getDescription() ?></h4>
 						<p>
 							<span class="btn btn-mini">
 								<i class="icon-cog"></i>
 								<span class="calltoaction">code</span>
 							</span>
-							<span class="variable-name">UserConfig::$<?php echo $setting['name'] ?> (<?php echo StartupAPI::phpType($setting['type']) ?>)</span>
+							<span class="variable-name">UserConfig::$<?php echo $setting->getName() ?> (<?php echo $setting->phpType() ?>)</span>
 						</p>
 					</td>
 
@@ -175,36 +78,30 @@ function value($type, $value, $options = array()) {
 						<?php
 						$options = array_key_exists('options', $setting) ? $setting['options'] : array();
 
-						if (substr($setting['type'], -2) == '[]' && is_array(UserConfig::$$var_name)) {
-							if (count(UserConfig::$$var_name) == 0) {
+						if (substr($setting->getType(), -2) == '[]' && is_array(UserConfig::${$setting->getName()})) {
+							if (count(UserConfig::${$setting->getName()}) == 0) {
 								?>
 								<span class="startupapi-admin-setting-value null">&mdash;</span>
 								<?php
 							}
-							foreach (UserConfig::$$var_name as $value) {
+							foreach (UserConfig::${$setting->getName()} as $value) {
 								?>
 								<div>
 									<?php
-									value(substr($setting['type'], 0, -2), $value, $options);
+									echo $setting->value($value);
 									?>
 								</div>
 								<?php
 							}
 						} else {
-							value($setting['type'], UserConfig::$$var_name, $options);
+							echo $setting->value(UserConfig::${$setting->getName()});
 						}
 						?>
 					</td>
 				</tr>
 				<tr>
 					<td colspan="2">
-						<pre>
-/**
- * <?php echo $setting['description'] . "\n" ?>
- *
- * @var <?php echo StartupAPI::phpType($setting['type']) . "\n" ?>
- */
-UserConfig::$<?php echo $setting['name'] ?> = <?php codeValue($setting['type'], UserConfig::$$var_name, isset($setting['options']) ? $setting['options'] : null) ?>;</pre>
+						<pre><?php echo $setting->code(UserConfig::${$setting->getName()})?></pre>
 					</td>
 				</tr>
 				<?php
diff --git a/admin/sources.php b/admin/sources.php
index 0308fc3..9017ff8 100644
--- a/admin/sources.php
+++ b/admin/sources.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $ADMIN_SECTION = 'sources';
diff --git a/admin/stopimpersonation.php b/admin/stopimpersonation.php
index 5411b5a..b863057 100644
--- a/admin/stopimpersonation.php
+++ b/admin/stopimpersonation.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 $real_user = User::get(false); // getting real user, ignoring impersonation
diff --git a/admin/templates/settings/code/boolean.html.twig b/admin/templates/settings/code/boolean.html.twig
new file mode 100644
index 0000000..ef47882
--- /dev/null
+++ b/admin/templates/settings/code/boolean.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-code-value boolean">{%if value %}TRUE{% else %}FALSE{% endif %}</span>
diff --git a/admin/templates/settings/code/callable_array.html.twig b/admin/templates/settings/code/callable_array.html.twig
new file mode 100644
index 0000000..c4e2ea1
--- /dev/null
+++ b/admin/templates/settings/code/callable_array.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-code-value callable">array('{{value[0]}}', '{{value[1]}}')</span>
diff --git a/admin/templates/settings/code/callable_closure.html.twig b/admin/templates/settings/code/callable_closure.html.twig
new file mode 100644
index 0000000..a23a777
--- /dev/null
+++ b/admin/templates/settings/code/callable_closure.html.twig
@@ -0,0 +1,3 @@
+<span class="startupapi-admin-code-value callable">function({{arguments|join(', '))}}) {
+    &hellip;
+}</span>
diff --git a/admin/templates/settings/code/callable_string.html.twig b/admin/templates/settings/code/callable_string.html.twig
new file mode 100644
index 0000000..b1657fa
--- /dev/null
+++ b/admin/templates/settings/code/callable_string.html.twig
@@ -0,0 +1 @@
+'<span class="startupapi-admin-code-value callable">{{value}}</span>'
diff --git a/admin/templates/settings/code/code.html.twig b/admin/templates/settings/code/code.html.twig
new file mode 100644
index 0000000..d374e31
--- /dev/null
+++ b/admin/templates/settings/code/code.html.twig
@@ -0,0 +1,6 @@
+/**
+ * {{description}}
+ *
+ * @var {{php_type}}
+ */
+UserConfig::${{name}} = 
diff --git a/admin/templates/settings/code/null.html.twig b/admin/templates/settings/code/null.html.twig
new file mode 100644
index 0000000..c0c9c2f
--- /dev/null
+++ b/admin/templates/settings/code/null.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-code-value null">null</span>
diff --git a/admin/templates/settings/code/secret.html.twig b/admin/templates/settings/code/secret.html.twig
new file mode 100644
index 0000000..2c28ad1
--- /dev/null
+++ b/admin/templates/settings/code/secret.html.twig
@@ -0,0 +1 @@
+'<span class="startupapi-admin-code-value secret" title="Actual value is not shown for security reasons">****************</span>'
diff --git a/admin/templates/settings/code/string.html.twig b/admin/templates/settings/code/string.html.twig
new file mode 100644
index 0000000..f49557f
--- /dev/null
+++ b/admin/templates/settings/code/string.html.twig
@@ -0,0 +1 @@
+'<span class="startupapi-admin-code-value string">{{value}}</span>'
diff --git a/admin/templates/settings/code/unknown.html.twig b/admin/templates/settings/code/unknown.html.twig
new file mode 100644
index 0000000..54d69fd
--- /dev/null
+++ b/admin/templates/settings/code/unknown.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-code-value unknown">{{var_export}}</span>
diff --git a/admin/templates/settings/code/value.html.twig b/admin/templates/settings/code/value.html.twig
new file mode 100644
index 0000000..bfe422d
--- /dev/null
+++ b/admin/templates/settings/code/value.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-code-value int">{{value}}</span>
diff --git a/admin/templates/settings/value/boolean.html.twig b/admin/templates/settings/value/boolean.html.twig
new file mode 100644
index 0000000..dd7b1f6
--- /dev/null
+++ b/admin/templates/settings/value/boolean.html.twig
@@ -0,0 +1,7 @@
+<span class="badge{% if value %} badge-success{% endif %}">
+    {% if value %}
+        {{true_string}}
+    {% else %}
+        {{false_string}}
+    {% endif %}
+</span>
diff --git a/admin/templates/settings/value/callable.html.twig b/admin/templates/settings/value/callable.html.twig
new file mode 100644
index 0000000..7c758c2
--- /dev/null
+++ b/admin/templates/settings/value/callable.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value callable">{{value}}({{arguments|join(', ')}}) { &hellip; }</span>
diff --git a/admin/templates/settings/value/callable_closure.html.twig b/admin/templates/settings/value/callable_closure.html.twig
new file mode 100644
index 0000000..43afa3d
--- /dev/null
+++ b/admin/templates/settings/value/callable_closure.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value callable">function({{arguments|join(', ')}}) { &hellip; }</span>
diff --git a/admin/templates/settings/value/cookie_key.html.twig b/admin/templates/settings/value/cookie_key.html.twig
new file mode 100644
index 0000000..cd07a66
--- /dev/null
+++ b/admin/templates/settings/value/cookie_key.html.twig
@@ -0,0 +1 @@
+<span class="badge badge-warning"><i class="icon-tags icon-white"></i> {{key}}</span>
diff --git a/admin/templates/settings/value/int.html.twig b/admin/templates/settings/value/int.html.twig
new file mode 100644
index 0000000..d40b643
--- /dev/null
+++ b/admin/templates/settings/value/int.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value int">{{value}}</span>
diff --git a/admin/templates/settings/value/minutes.html.twig b/admin/templates/settings/value/minutes.html.twig
new file mode 100644
index 0000000..9421a82
--- /dev/null
+++ b/admin/templates/settings/value/minutes.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value minutes">{{minutes}}</span> minutes
diff --git a/admin/templates/settings/value/null.html.twig b/admin/templates/settings/value/null.html.twig
new file mode 100644
index 0000000..a152d47
--- /dev/null
+++ b/admin/templates/settings/value/null.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value null">&mdash;</span>
diff --git a/admin/templates/settings/value/path.html.twig b/admin/templates/settings/value/path.html.twig
new file mode 100644
index 0000000..cd35557
--- /dev/null
+++ b/admin/templates/settings/value/path.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value path">{{path}}</span>
diff --git a/admin/templates/settings/value/seconds.html.twig b/admin/templates/settings/value/seconds.html.twig
new file mode 100644
index 0000000..b41ee9e
--- /dev/null
+++ b/admin/templates/settings/value/seconds.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value seconds">{{seconds}}</span> seconds ({{days}} days)
diff --git a/admin/templates/settings/value/secret.html.twig b/admin/templates/settings/value/secret.html.twig
new file mode 100644
index 0000000..2c2ab3f
--- /dev/null
+++ b/admin/templates/settings/value/secret.html.twig
@@ -0,0 +1 @@
+<span class="startupapi-admin-setting-value secret">hidden</span>
diff --git a/admin/templates/settings/value/string.html.twig b/admin/templates/settings/value/string.html.twig
new file mode 100644
index 0000000..1c9e668
--- /dev/null
+++ b/admin/templates/settings/value/string.html.twig
@@ -0,0 +1 @@
+'<span class="startupapi-admin-setting-value string">{{value}}</span>'
diff --git a/admin/templates/settings/value/url.html.twig b/admin/templates/settings/value/url.html.twig
new file mode 100644
index 0000000..ef051dd
--- /dev/null
+++ b/admin/templates/settings/value/url.html.twig
@@ -0,0 +1 @@
+<a class="startupapi-admin-setting-value url" target="_blank" href="{{url}}">{{url}}<i class="icon-share-alt"></i></a>
diff --git a/admin/templates/settings/value/user_id.html.twig b/admin/templates/settings/value/user_id.html.twig
new file mode 100644
index 0000000..aa226da
--- /dev/null
+++ b/admin/templates/settings/value/user_id.html.twig
@@ -0,0 +1 @@
+<a href="user.php?id={{id}}"><i class="icon-user"></i> {{name}}</a>
diff --git a/admin/templates/settings/value/var_export.html.twig b/admin/templates/settings/value/var_export.html.twig
new file mode 100644
index 0000000..f5481d8
--- /dev/null
+++ b/admin/templates/settings/value/var_export.html.twig
@@ -0,0 +1 @@
+<pre class="t8-toggle startupapi-admin-setting-value unknown">{{var_export}}</pre>
diff --git a/admin/transaction_log.php b/admin/transaction_log.php
index b273609..9017a42 100644
--- a/admin/transaction_log.php
+++ b/admin/transaction_log.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 $account_id = htmlspecialchars($_REQUEST['account_id']);
diff --git a/admin/user.php b/admin/user.php
index c6e4693..ca3eee8 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/admin.php');
 
 if (!array_key_exists('id', $_GET) || !$_GET['id']) {
diff --git a/admin/users.php b/admin/users.php
index 5d1f463..ae07ca3 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/admin.php');
 
 $ADMIN_SECTION = 'registrations';
diff --git a/api.php b/api.php
index 7b4c001..c91d3a2 100644
--- a/api.php
+++ b/api.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/global.php');
 
 if (!array_key_exists('call', $_GET)) {
@@ -40,8 +42,8 @@
 		<p>
 			Available endpoints:
 			<?php
-			$all_endpoints = \StartupAPI\API\Endpoint::getAllEndpointsBySlug();
-			foreach (\StartupAPI\API\Endpoint::getNamespaces() as $namespace) {
+			$all_endpoints = API\Endpoint::getAllEndpointsBySlug();
+			foreach (API\Endpoint::getNamespaces() as $namespace) {
 				?>
 			<h2><?php echo $namespace->getName(); ?></h2>
 			<ul>
@@ -147,13 +149,13 @@
 
 // parameters come from query string
 $query = $_SERVER['QUERY_STRING'];
-$params = \StartupAPI\API\Endpoint::parseURLEncoded($query);
+$params = API\Endpoint::parseURLEncoded($query);
 
 
 $raw_request_body = file_get_contents('php://input');
 
 if (!empty($raw_request_body) && strtolower($_SERVER['CONTENT_TYPE']) == 'application/x-www-form-urlencoded') {
-	$params = \StartupAPI\API\Endpoint::parseURLEncoded($raw_request_body, $params);
+	$params = API\Endpoint::parseURLEncoded($raw_request_body, $params);
 }
 
 unset($params['call']); // except for the call parameter
@@ -161,7 +163,7 @@
 header('Content-type: application/json');
 
 try {
-	$endpoint = \StartupAPI\API\Endpoint::getEndpoint($_SERVER['REQUEST_METHOD'], $_GET['call']);
+	$endpoint = API\Endpoint::getEndpoint($_SERVER['REQUEST_METHOD'], $_GET['call']);
 
 	// default output format is JSON
 	$response = array(
@@ -171,7 +173,7 @@
 		),
 		'result' => $endpoint->call($params, $raw_request_body)
 	);
-} catch (\StartupAPI\API\NotFoundException $ex) {
+} catch (API\Exceptions\NotFoundException $ex) {
 	header('HTTP/1.0 404 Not Found');
 	$response = array(
 		'meta' => array(
@@ -180,7 +182,7 @@
 			'error_code' => $ex->getCode()
 		)
 	);
-} catch (\StartupAPI\API\MethodNotAllowedException $ex) {
+} catch (API\Exceptions\MethodNotAllowedException $ex) {
 	header('HTTP/1.0 405 Method not allowed');
 	$response = array(
 		'meta' => array(
@@ -189,7 +191,7 @@
 			'error_code' => $ex->getCode()
 		)
 	);
-} catch (\StartupAPI\API\UnauthenticatedException $ex) {
+} catch (API\Exceptions\UnauthenticatedException $ex) {
 	header('HTTP/1.0 401 Authentication Required');
 	header('WWW-Authenticate: FormBased');
 	$response = array(
@@ -199,7 +201,7 @@
 			'error_code' => $ex->getCode()
 		)
 	);
-} catch (\StartupAPI\API\UnauthorizedException $ex) {
+} catch (API\Exceptions\UnauthorizedException $ex) {
 	header('HTTP/1.0 403 Forbidden');
 	$response = array(
 		'meta' => array(
@@ -208,7 +210,7 @@
 			'error_code' => $ex->getCode()
 		)
 	);
-} catch (\StartupAPI\API\BadParameterException $ex) {
+} catch (API\Exceptions\BadParameterException $ex) {
 	header('HTTP/1.0 400 Bad Parameter');
 	$response = array(
 		'meta' => array(
@@ -217,7 +219,7 @@
 			'error_code' => $ex->getCode()
 		)
 	);
-} catch (\StartupAPI\API\APIException $ex) {
+} catch (API\API\ExceptionsException $ex) {
 	header('HTTP/1.0 500 Server Error');
 	$response = array(
 		'meta' => array(
diff --git a/apigen.neon b/apigen.neon
index 921b548..7ee8646 100644
--- a/apigen.neon
+++ b/apigen.neon
@@ -3,25 +3,23 @@ source: .
 destination: docs/apigen
 
 exclude:
-	- */oauth-php/*
-	- */modules/facebook/facebook-php-sdk/*
-	- */dbupgrade/*
-	- */admin/swfobject/*
-	- */docs/*
-	- */twig/*
-	- */phptidy/*
-	- */apigen-docs/*
-	- */classes/CookieStorage.php
+  - */oauth-php/*
+  - */modules/facebook/facebook-php-sdk/*
+  - */modules/facebook/facebook-php-sdk/src/*
+  - */dbupgrade/*
+  - */admin/swfobject/*
+  - */docs/*
+  - */twig/*
+  - */phptidy/*
+  - */classes/MrClay_CookieStorage.php
+  - */swiftmailer/*
+  - */php-bootstrap/*
 
 php: no
 
-report: docs/apigen/report.xml
-
 todo: yes
 
 accessLevels:
-	- public
-	- protected
-	- private
-
-updateCheck: no
+  - public
+  - protected
+  - private
diff --git a/badges.php b/badges.php
index f5de69e..2a95c4a 100644
--- a/badges.php
+++ b/badges.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
diff --git a/change_account.php b/change_account.php
index a7f97ea..3fd3c09 100644
--- a/change_account.php
+++ b/change_account.php
@@ -1,7 +1,7 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/global.php');
-require_once(__DIR__.'/classes/User.php');
-require_once(__DIR__.'/classes/Account.php');
 
 $user = User::require_login();
 
diff --git a/classes/API/AuthenticatedEndpoint.php b/classes/API/AuthenticatedEndpoint.php
new file mode 100644
index 0000000..e241969
--- /dev/null
+++ b/classes/API/AuthenticatedEndpoint.php
@@ -0,0 +1,35 @@
+<?php
+namespace StartupAPI\API;
+
+/**
+ * StartupAPI API AuthenticatedEndpoint class
+ *
+ * Abstract class for API authenticated endpoints, should not be instantiated directly
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+
+abstract class AuthenticatedEndpoint extends Endpoint {
+
+	/**
+	 * Performs authentication before processing the call, returns authenticated user object.
+	 * Not supposed to be called directly, but subclasses can use this return value as a shortcut.
+	 *
+	 * @param mixed[] $values Associative array of parameter values for this call
+	 * @return User Returns currently authenticated user
+	 * @throws UnauthenticatedException
+	 */
+	protected function call($values, $raw_request_body = null) {
+		parent::call($values);
+
+		$user = \StartupAPI::getUser();
+
+		if (is_null($user)) {
+			throw new Exceptions\UnauthenticatedException();
+		}
+
+		return $user;
+	}
+
+}
diff --git a/classes/API/Endpoint.php b/classes/API/Endpoint.php
index 031fc81..507abb6 100644
--- a/classes/API/Endpoint.php
+++ b/classes/API/Endpoint.php
@@ -1,25 +1,10 @@
 <?php
-
-/**
- * @package StartupAPI
- * @subpackage API
- */
-
 namespace StartupAPI\API;
 
-require_once(__DIR__ . '/EndpointNameSpace.php');
-
-// APIs Endpoints to be registered
-require_once(__DIR__ . '/v1/Login.php');
-require_once(__DIR__ . '/v1/User.php');
-require_once(__DIR__ . '/v1/Accounts.php');
-
-require_once(dirname(__DIR__) . '/AuthenticationModule.php');
-
 /**
  * StartupAPI API Endpoint class
  *
- * Root abstract class for API endpoints, should not be implemented directly
+ * Root abstract class for API endpoints, should not be instantiated directly
  *
  * @package StartupAPI
  * @subpackage API
@@ -76,7 +61,7 @@ public static function registerCoreEndpoints() {
 		$namespace = new EndpointNameSpace(
 				'startupapi', 'StartupAPI', 'Startup API core endpoints'
 		);
-		if (!is_null(\AuthenticationModule::get('usernamepass'))) {
+		if (!is_null(\StartupAPI\AuthenticationModule::get('usernamepass'))) {
 			self::register($namespace, 'POST', new \StartupAPI\API\v1\Login());
 		}
 		self::register($namespace, 'GET', new \StartupAPI\API\v1\User());
@@ -128,7 +113,7 @@ public static function getEndpoint($method, $call_slug) {
 		$parts = explode('/', $call_slug, 3);
 
 		if (!is_array($parts) || !isset($parts[1]) || !isset($parts[2])) {
-			throw new \StartupAPI\API\MalformedCallSlugException($call_slug);
+			throw new Exceptions\MalformedCallSlugException($call_slug);
 		}
 
 		$namespace_slug = $parts[1];
@@ -137,15 +122,15 @@ public static function getEndpoint($method, $call_slug) {
 		$endpoint_slug = "/$endpoint_slug";
 
 		if (!array_key_exists($namespace_slug, self::$endpoints_by_method)) {
-			throw new \StartupAPI\API\NamespaceNotFoundException($namespace_slug);
+			throw new Exceptions\NamespaceNotFoundException($namespace_slug);
 		}
 
 		if (!array_key_exists($method, self::$endpoints_by_method[$namespace_slug])) {
-			throw new \StartupAPI\API\MethodNotAllowedException($method);
+			throw new Exceptions\MethodNotAllowedException($method);
 		}
 
 		if (!array_key_exists($endpoint_slug, self::$endpoints_by_method[$namespace_slug][$method])) {
-			throw new \StartupAPI\API\CallNotFoundException($method, $call_slug);
+			throw new Exceptions\CallNotFoundException($method, $call_slug);
 		}
 
 		return self::$endpoints_by_method[$namespace_slug][$method][$endpoint_slug];
@@ -221,11 +206,11 @@ protected function call($values, $raw_request_body = null) {
 		// check all passed parameters
 		foreach ($values as $name => $value) {
 			if (!array_key_exists($name, $this->params)) {
-				throw new UnknownParameterException($name);
+				throw new Exceptions\UnknownParameterException($name);
 			}
 
 			if (!$this->params[$name]->validate($value)) {
-				throw new InvalidParameterValueException("Invalid parameter value for $name");
+				throw new Exceptions\InvalidParameterValueException("Invalid parameter value for $name");
 			}
 
 			unset($missing_params[$name]);
@@ -234,254 +219,9 @@ protected function call($values, $raw_request_body = null) {
 		// check if missing parameters are required
 		foreach ($missing_params as $key => $param) {
 			if (!$param->isOptional()) {
-				throw new RequiredParameterException($key);
+				throw new Exceptions\RequiredParameterException($key);
 			}
 		}
 	}
 
 }
-
-abstract class AuthenticatedEndpoint extends Endpoint {
-
-	/**
-	 * Performs authentication before processing the call, returns authenticated user object.
-	 * Not supposed to be called directly, but subclasses can use this return value as a shortcut.
-	 *
-	 * @param mixed[] $values Associative array of parameter values for this call
-	 * @return User Returns currently authenticated user
-	 * @throws UnauthenticatedException
-	 */
-	protected function call($values, $raw_request_body = null) {
-		parent::call($values);
-
-		$user = \StartupAPI::getUser();
-
-		if (is_null($user)) {
-			throw new UnauthenticatedException();
-		}
-
-		return $user;
-	}
-
-}
-
-/*
- * API Exceptions
- */
-
-/**
- * Abstract class for all API Exceptions
- */
-abstract class APIException extends \StartupAPIException {
-
-}
-
-/**
- * Thrown when parameter value is invalid
- */
-class InvalidParameterValueException extends APIException {
-
-	function __construct($message = "Invalid parameter value", $code = null, $previous = null) {
-		parent::__construct($message, $code, $previous);
-	}
-
-}
-
-abstract class BadRequestException extends APIException {
-
-}
-
-/**
- * Thrown when we can't parse "call" parameter
- */
-class MalformedCallSlugException extends APIException {
-
-	private $call_slug;
-
-	/**
-	 * @param string $name Parameter name
-	 * @param string $message Exception message
-	 * @param int $code Exception code
-	 * @param Exception $previous previous exception
-	 */
-	function __construct($call_slug, $message = "Malformed call slug") {
-		parent::__construct($message);
-
-		$this->call_slug = $call_slug;
-		$this->message = $message . ": $call_slug";
-	}
-
-	private function getCallSlug() {
-		return $this->call_slug;
-	}
-
-}
-
-abstract class BadParameterException extends BadRequestException {
-
-}
-
-/**
- * Thrown when parameter is required
- */
-class RequiredParameterException extends BadParameterException {
-
-	private $name;
-
-	/**
-	 * @param string $name Parameter name
-	 * @param string $message Exception message
-	 * @param int $code Exception code
-	 * @param Exception $previous previous exception
-	 */
-	function __construct($name, $message = "Parameter required", $code = null, $previous = null) {
-		parent::__construct($message, $code, $previous);
-
-		$this->name = $name;
-		$this->message = $message . ": $name";
-	}
-
-	private function getParameterName() {
-		return $this->name;
-	}
-
-}
-
-/**
- * Thrown when parameter passed is not defined for endpoint
- */
-class UnknownParameterException extends BadParameterException {
-
-	private $param_name;
-
-	function __construct($param_name, $message = "Unknown parameter") {
-		parent::__construct($message);
-
-		$this->param_name = $param_name;
-		$this->message = $message . ": $param_name";
-	}
-
-	private function getParameterName() {
-		return $this->param_name;
-	}
-
-}
-
-/**
- * Thrown when no authentication provided when required
- */
-class UnauthenticatedException extends APIException {
-
-	function __construct($message = "User not authenticated") {
-		parent::__construct($message, 401);
-	}
-
-}
-
-/**
- * Thrown when user is authenticated, but not allowed to make a request
- */
-class UnauthorizedException extends APIException {
-
-	function __construct($message = "Request forbidden") {
-		parent::__construct($message, 403);
-	}
-
-}
-
-/**
- * Thrown when no endpoints accept HTTP method used
- */
-class MethodNotAllowedException extends APIException {
-
-	private $method;
-
-	/**
-	 * @param string $method HTTP Method
-	 * @param string $message Exception message
-	 * @param int $code Exception code
-	 * @param Exception $previous previous exception
-	 */
-	function __construct($method = null, $message = "HTTP Method not allowed", $code = null, $previous = null) {
-		parent::__construct($message, $code, $previous);
-
-		$this->method = $method;
-		if (!is_null($this->method)) {
-			$this->message = $message . ": $method";
-		}
-	}
-
-	private function getMethod() {
-		return $this->method;
-	}
-
-}
-
-/**
- * Abstract class for things that are not found
- */
-abstract class NotFoundException extends APIException {
-
-	function __construct($message = "Not found") {
-		parent::__construct($message, 404);
-	}
-
-}
-
-/**
- * Thrown when requested onject is not found
- */
-class ObjectNotFoundException extends NotFoundException {
-
-}
-
-/**
- * Thrown when API namespace is not found
- */
-class NamespaceNotFoundException extends NotFoundException {
-
-	private $namespace_slug;
-
-	function __construct($namespace_slug, $message = "API Namespace not found") {
-		parent::__construct($message);
-
-		$this->namespace_slug = $namespace_slug;
-		$this->message = $message . ": $namespace_slug";
-	}
-
-	private function getNamespaceSlug() {
-		return $this->namespace_slug;
-	}
-
-}
-
-/**
- * Thrown when there is no such endpoint (for a method used)
- */
-class CallNotFoundException extends NotFoundException {
-
-	private $method;
-	private $call_slug;
-
-	/**
-	 * @param string $method HTTP Method
-	 * @param string $call_slug API call slug
-	 * @param string $message Exception message
-	 */
-	function __construct($method, $call_slug, $message = "API call not found") {
-		parent::__construct($message);
-
-		$this->method = $method;
-		$this->call_slug = $call_slug;
-		$this->message = $message . ": $method $call_slug";
-	}
-
-	private function getMethod() {
-		return $this->method;
-	}
-
-	private function getCallSlug() {
-		return $this->call_slug;
-	}
-
-}
diff --git a/classes/API/EndpointNameSpace.php b/classes/API/EndpointNameSpace.php
index 9893e7d..12b47ac 100644
--- a/classes/API/EndpointNameSpace.php
+++ b/classes/API/EndpointNameSpace.php
@@ -1,10 +1,4 @@
 <?php
-
-/**
- * @package StartupAPI
- * @subpackage API
- */
-
 namespace StartupAPI\API;
 
 /**
diff --git a/classes/API/Exceptions/APIException.php b/classes/API/Exceptions/APIException.php
new file mode 100644
index 0000000..7662700
--- /dev/null
+++ b/classes/API/Exceptions/APIException.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Abstract class for all API Exceptions
+ * 
+ * @package StartupAPI
+ * @subpackage API
+ */
+abstract class APIException extends \StartupAPI\Exceptions\StartupAPIException {
+
+}
diff --git a/classes/API/Exceptions/BadParameterException.php b/classes/API/Exceptions/BadParameterException.php
new file mode 100644
index 0000000..5617c46
--- /dev/null
+++ b/classes/API/Exceptions/BadParameterException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * @package StartupAPI
+ * @subpackage API
+ */
+abstract class BadParameterException extends BadRequestException {
+
+}
diff --git a/classes/API/Exceptions/BadRequestException.php b/classes/API/Exceptions/BadRequestException.php
new file mode 100644
index 0000000..687bc22
--- /dev/null
+++ b/classes/API/Exceptions/BadRequestException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * @package StartupAPI
+ * @subpackage API
+ */
+abstract class BadRequestException extends APIException {
+
+}
diff --git a/classes/API/Exceptions/CallNotFoundException.php b/classes/API/Exceptions/CallNotFoundException.php
new file mode 100644
index 0000000..91425c2
--- /dev/null
+++ b/classes/API/Exceptions/CallNotFoundException.php
@@ -0,0 +1,36 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when there is no such endpoint (for a method used)
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class CallNotFoundException extends NotFoundException {
+
+	private $method;
+	private $call_slug;
+
+	/**
+	 * @param string $method HTTP Method
+	 * @param string $call_slug API call slug
+	 * @param string $message Exception message
+	 */
+	function __construct($method, $call_slug, $message = "API call not found") {
+		parent::__construct($message);
+
+		$this->method = $method;
+		$this->call_slug = $call_slug;
+		$this->message = $message . ": $method $call_slug";
+	}
+
+	private function getMethod() {
+		return $this->method;
+	}
+
+	private function getCallSlug() {
+		return $this->call_slug;
+	}
+
+}
diff --git a/classes/API/Exceptions/InvalidParameterValueException.php b/classes/API/Exceptions/InvalidParameterValueException.php
new file mode 100644
index 0000000..143804f
--- /dev/null
+++ b/classes/API/Exceptions/InvalidParameterValueException.php
@@ -0,0 +1,16 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when parameter value is invalid
+ * 
+ * @package StartupAPI
+ * @subpackage API
+ */
+class InvalidParameterValueException extends APIException {
+
+	function __construct($message = "Invalid parameter value", $code = null, $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+
+}
diff --git a/classes/API/Exceptions/MalformedCallSlugException.php b/classes/API/Exceptions/MalformedCallSlugException.php
new file mode 100644
index 0000000..06f24d2
--- /dev/null
+++ b/classes/API/Exceptions/MalformedCallSlugException.php
@@ -0,0 +1,31 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when we can't parse "call" parameter
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class MalformedCallSlugException extends APIException {
+
+	private $call_slug;
+
+	/**
+	 * @param string $name Parameter name
+	 * @param string $message Exception message
+	 * @param int $code Exception code
+	 * @param Exception $previous previous exception
+	 */
+	function __construct($call_slug, $message = "Malformed call slug") {
+		parent::__construct($message);
+
+		$this->call_slug = $call_slug;
+		$this->message = $message . ": $call_slug";
+	}
+
+	private function getCallSlug() {
+		return $this->call_slug;
+	}
+
+}
diff --git a/classes/API/Exceptions/MethodNotAllowedException.php b/classes/API/Exceptions/MethodNotAllowedException.php
new file mode 100644
index 0000000..900a846
--- /dev/null
+++ b/classes/API/Exceptions/MethodNotAllowedException.php
@@ -0,0 +1,33 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when no endpoints accept HTTP method used
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class MethodNotAllowedException extends APIException {
+
+	private $method;
+
+	/**
+	 * @param string $method HTTP Method
+	 * @param string $message Exception message
+	 * @param int $code Exception code
+	 * @param Exception $previous previous exception
+	 */
+	function __construct($method = null, $message = "HTTP Method not allowed", $code = null, $previous = null) {
+		parent::__construct($message, $code, $previous);
+
+		$this->method = $method;
+		if (!is_null($this->method)) {
+			$this->message = $message . ": $method";
+		}
+	}
+
+	private function getMethod() {
+		return $this->method;
+	}
+
+}
diff --git a/classes/API/Exceptions/NamespaceNotFoundException.php b/classes/API/Exceptions/NamespaceNotFoundException.php
new file mode 100644
index 0000000..e1f15d3
--- /dev/null
+++ b/classes/API/Exceptions/NamespaceNotFoundException.php
@@ -0,0 +1,25 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when API namespace is not found
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class NamespaceNotFoundException extends NotFoundException {
+
+	private $namespace_slug;
+
+	function __construct($namespace_slug, $message = "API Namespace not found") {
+		parent::__construct($message);
+
+		$this->namespace_slug = $namespace_slug;
+		$this->message = $message . ": $namespace_slug";
+	}
+
+	private function getNamespaceSlug() {
+		return $this->namespace_slug;
+	}
+
+}
diff --git a/classes/API/Exceptions/NotFoundException.php b/classes/API/Exceptions/NotFoundException.php
new file mode 100644
index 0000000..f5869ba
--- /dev/null
+++ b/classes/API/Exceptions/NotFoundException.php
@@ -0,0 +1,16 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Abstract class for things that are not found
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+abstract class NotFoundException extends APIException {
+
+	function __construct($message = "Not found") {
+		parent::__construct($message, 404);
+	}
+
+}
diff --git a/classes/API/Exceptions/ObjectNotFoundException.php b/classes/API/Exceptions/ObjectNotFoundException.php
new file mode 100644
index 0000000..24a12a0
--- /dev/null
+++ b/classes/API/Exceptions/ObjectNotFoundException.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when requested onject is not found
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class ObjectNotFoundException extends NotFoundException {
+
+}
diff --git a/classes/API/Exceptions/RequiredParameterException.php b/classes/API/Exceptions/RequiredParameterException.php
new file mode 100644
index 0000000..34dfc18
--- /dev/null
+++ b/classes/API/Exceptions/RequiredParameterException.php
@@ -0,0 +1,31 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when parameter is required
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class RequiredParameterException extends BadParameterException {
+
+	private $name;
+
+	/**
+	 * @param string $name Parameter name
+	 * @param string $message Exception message
+	 * @param int $code Exception code
+	 * @param Exception $previous previous exception
+	 */
+	function __construct($name, $message = "Parameter required", $code = null, $previous = null) {
+		parent::__construct($message, $code, $previous);
+
+		$this->name = $name;
+		$this->message = $message . ": $name";
+	}
+
+	private function getParameterName() {
+		return $this->name;
+	}
+
+}
diff --git a/classes/API/Exceptions/UnauthenticatedException.php b/classes/API/Exceptions/UnauthenticatedException.php
new file mode 100644
index 0000000..99a7650
--- /dev/null
+++ b/classes/API/Exceptions/UnauthenticatedException.php
@@ -0,0 +1,16 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when no authentication provided when required
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class UnauthenticatedException extends APIException {
+
+	function __construct($message = "User not authenticated") {
+		parent::__construct($message, 401);
+	}
+
+}
diff --git a/classes/API/Exceptions/UnauthorizedException.php b/classes/API/Exceptions/UnauthorizedException.php
new file mode 100644
index 0000000..ad4ed51
--- /dev/null
+++ b/classes/API/Exceptions/UnauthorizedException.php
@@ -0,0 +1,16 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when user is authenticated, but not allowed to make a request
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class UnauthorizedException extends APIException {
+
+	function __construct($message = "Request forbidden") {
+		parent::__construct($message, 403);
+	}
+
+}
diff --git a/classes/API/Exceptions/UnknownParameterException.php b/classes/API/Exceptions/UnknownParameterException.php
new file mode 100644
index 0000000..72a8d0b
--- /dev/null
+++ b/classes/API/Exceptions/UnknownParameterException.php
@@ -0,0 +1,25 @@
+<?php
+namespace StartupAPI\API\Exceptions;
+
+/**
+ * Thrown when parameter passed is not defined for endpoint
+ *
+ * @package StartupAPI
+ * @subpackage API
+ */
+class UnknownParameterException extends BadParameterException {
+
+	private $param_name;
+
+	function __construct($param_name, $message = "Unknown parameter") {
+		parent::__construct($message);
+
+		$this->param_name = $param_name;
+		$this->message = $message . ": $param_name";
+	}
+
+	private function getParameterName() {
+		return $this->param_name;
+	}
+
+}
diff --git a/classes/API/Parameter.php b/classes/API/Parameter.php
index a68563f..3ca9bf8 100644
--- a/classes/API/Parameter.php
+++ b/classes/API/Parameter.php
@@ -1,10 +1,4 @@
 <?php
-
-/**
- * @package StartupAPI
- * @subpackage API
- */
-
 namespace StartupAPI\API;
 
 /**
@@ -89,11 +83,11 @@ public function allowsMultipleValues() {
 	public function validate($value) {
 		// invalid if multiples are not allowed, but array of values is passed in
 		if (!$this->multiple && is_array($value)) {
-			throw new InvalidParameterValueException("Multiple values are not allowed for this parameter");
+			throw new Exceptions\InvalidParameterValueException("Multiple values are not allowed for this parameter");
 		}
 
 		if (is_null($value) && !$this->optional) {
-			throw new RequiredParameterException();
+			throw new Exceptions\RequiredParameterException();
 		}
 
 		return true;
diff --git a/classes/API/v1/Accounts.php b/classes/API/v1/Accounts.php
index d7c509e..712e01e 100644
--- a/classes/API/v1/Accounts.php
+++ b/classes/API/v1/Accounts.php
@@ -2,12 +2,6 @@
 
 namespace StartupAPI\API\v1;
 
-/**
- * @package StartupAPI
- * @subpackage API
- */
-require_once(dirname(__DIR__) . '/Endpoint.php');
-
 /**
  * Returns currently authenticated user
  *
@@ -26,7 +20,7 @@ public function call($values, $raw_request_body = null) {
 		$accounts = $user->getAccounts();
 
 		// @TODO Implement general API serialization logic for all objects
-		return array_map(function(Account $account) {
+		return array_map(function(\StartupAPI\Account $account) {
 			$users_and_roles = $account->getUsers();
 			return array(
 				'id' => $account->getID(),
diff --git a/classes/API/v1/Login.php b/classes/API/v1/Login.php
index 3acbbc1..35a0cab 100644
--- a/classes/API/v1/Login.php
+++ b/classes/API/v1/Login.php
@@ -2,16 +2,6 @@
 
 namespace StartupAPI\API\v1;
 
-/**
- * @package StartupAPI
- * @subpackage API
- */
-require_once(dirname(__DIR__) . '/Endpoint.php');
-require_once(dirname(__DIR__) . '/Parameter.php');
-
-require_once(dirname(dirname(__DIR__)) . '/User.php');
-require_once(dirname(dirname(__DIR__)) . '/Account.php');
-
 /**
  * Returns currently authenticated user
  *
@@ -37,7 +27,7 @@ public function call($values, $raw_request_body = null) {
 		$user = $module->processLogin($values, $remember);
 
 		if (is_null($user)) {
-			throw new \StartupAPI\API\UnauthenticatedException();
+			throw new \StartupAPI\API\Exceptions\UnauthenticatedException();
 		} else {
 			$user->setSession($remember);
 		}
diff --git a/classes/API/v1/User.php b/classes/API/v1/User.php
index 0abc3fa..b6c2e68 100644
--- a/classes/API/v1/User.php
+++ b/classes/API/v1/User.php
@@ -2,16 +2,6 @@
 
 namespace StartupAPI\API\v1;
 
-/**
- * @package StartupAPI
- * @subpackage API
- */
-require_once(dirname(__DIR__) . '/Endpoint.php');
-require_once(dirname(__DIR__) . '/Parameter.php');
-
-require_once(dirname(dirname(__DIR__)) . '/User.php');
-require_once(dirname(dirname(__DIR__)) . '/Account.php');
-
 /**
  * Returns currently authenticated user
  *
@@ -52,10 +42,10 @@ public function call($values, $raw_request_body = null) {
 				if ($users_belong_to_same_account) {
 					$user = $requested_user;
 				} else {
-					throw new \StartupAPI\API\UnauthorizedException("You are not allowed to request information about this user");
+					throw new \StartupAPI\API\Exceptions\UnauthorizedException("You are not allowed to request information about this user");
 				}
 			} else {
-				throw new \StartupAPI\API\ObjectNotFoundException("No such user");
+				throw new \StartupAPI\API\Exceptions\ObjectNotFoundException("No such user");
 			}
 		}
 
diff --git a/classes/Account.php b/classes/Account.php
index fa1bc7a..86c7f75 100644
--- a/classes/Account.php
+++ b/classes/Account.php
@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/Plan.php');
+namespace StartupAPI;
 
 /**
  * Account class represents accounts in the system.
@@ -97,7 +96,7 @@ class Account {
 	 *
 	 * @param int $id Account id
 	 * @return Account Account associated with specified ID
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getByID($id) {
 		$db = UserConfig::getDB();
@@ -106,23 +105,23 @@ public static function getByID($id) {
 		if (!($stmt = $db->prepare('SELECT name, plan_slug, schedule_slug, engine_slug,
 			active, next_charge, next_plan_slug, next_schedule_slug, next_engine_slug
 			FROM u_accounts WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $next_plan_slug, $next_schedule_slug, $next_engine_slug)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		if ($stmt->fetch() === TRUE) {
@@ -144,8 +143,8 @@ public static function getByID($id) {
 	 *
 	 * @return Account[] Array of user accounts
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function getUserAccounts(User $user) {
 		$db = UserConfig::getDB();
@@ -158,23 +157,23 @@ public static function getUserAccounts(User $user) {
 				'FROM u_accounts a ' .
 				'INNER JOIN u_account_users au ON a.id = au.account_id ' .
 				'WHERE au.user_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $userid)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $role, $next_plan_slug, $next_schedule_slug, $next_engine_slug)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -200,8 +199,8 @@ public static function getUserAccounts(User $user) {
 	 *
 	 * @return Account[] Array of user accounts
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function getAccounts($pagenumber = 0, $perpage = 20) {
 		$db = UserConfig::getDB();
@@ -215,23 +214,23 @@ public static function getAccounts($pagenumber = 0, $perpage = 20) {
 					FROM u_accounts
 					LIMIT ?, ?'
 				))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('ii', $first, $perpage)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $next_plan_slug, $next_schedule_slug, $next_engine_slug)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -249,8 +248,8 @@ public static function getAccounts($pagenumber = 0, $perpage = 20) {
 	 *
 	 * @return Account[] Array of user accounts
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function searchAccounts($search, $pagenumber = 0, $perpage = 20) {
 		$db = UserConfig::getDB();
@@ -265,23 +264,23 @@ public static function searchAccounts($search, $pagenumber = 0, $perpage = 20) {
 					WHERE INSTR(name, ?) > 0
 					LIMIT ?, ?'
 				))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('sii', $search, $first, $perpage)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $next_plan_slug, $next_schedule_slug, $next_engine_slug)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -301,8 +300,8 @@ public static function searchAccounts($search, $pagenumber = 0, $perpage = 20) {
 	 *
 	 * @return array Array of Account, role pairs
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function getUserAccountsAndRoles(User $user) {
 		$db = UserConfig::getDB();
@@ -315,23 +314,23 @@ public static function getUserAccountsAndRoles(User $user) {
 				'FROM u_accounts a ' .
 				'INNER JOIN u_account_users au ON a.id = au.account_id ' .
 				'WHERE au.user_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $userid)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $next_plan_slug, $next_schedule_slug, $next_engine_slug, $role)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -360,7 +359,7 @@ public static function getUserAccountsAndRoles(User $user) {
 	 *
 	 * @return int Total number of accounts in the system
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getTotalAccounts() {
 		$db = UserConfig::getDB();
@@ -369,16 +368,16 @@ public static function getTotalAccounts() {
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_accounts')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($total)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $total;
@@ -463,15 +462,15 @@ public function setName($name) {
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET name = ? WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('si', $this->name, $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$stmt->close();
@@ -482,26 +481,26 @@ public function setName($name) {
 	 *
 	 * @return array Array of User, role pairs
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUsers() {
 		$db = UserConfig::getDB();
 		$roles = array();
 
 		if (!($stmt = $db->prepare('SELECT user_id, role FROM u_account_users WHERE account_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($userid, $role)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -527,28 +526,28 @@ public function getUsers() {
 	 *
 	 * @return int|null User's role or null if user is not a member of the account
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserRole(User $user) {
 		$db = UserConfig::getDB();
 		$role = null;
 
 		if (!($stmt = $db->prepare('SELECT role FROM u_account_users WHERE account_id = ? AND user_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$user_id = $user->getID();
 
 		if (!$stmt->bind_param('ii', $this->id, $user_id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($role)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		$stmt->fetch();
@@ -563,7 +562,7 @@ public function getUserRole(User $user) {
 	 * @param User User
 	 * @param boolean $admin Set to true if you want to promote user to admin false if demote to regular user of the account
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function setUserRole(User $user, $admin) {
 		$db = UserConfig::getDB();
@@ -573,17 +572,17 @@ public function setUserRole(User $user, $admin) {
 					SET role = ?
 					WHERE account_id = ? AND user_id = ?'
 				))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$user_id = $user->getID();
 
 		if (!$stmt->bind_param('iii', $role_num, $this->id, $user_id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 	}
 
@@ -593,7 +592,7 @@ public function setUserRole(User $user, $admin) {
 	 * @param User $user User to add
 	 * @param int $role User role in the account
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function addUser(User $user, $role = self::ROLE_USER) {
 		$db = UserConfig::getDB();
@@ -602,15 +601,15 @@ public function addUser(User $user, $role = self::ROLE_USER) {
 
 		if ($stmt = $db->prepare('INSERT IGNORE INTO u_account_users (account_id, user_id, role) VALUES (?, ?, ?)')) {
 			if (!$stmt->bind_param('iii', $this->id, $userid, $role)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -619,7 +618,7 @@ public function addUser(User $user, $role = self::ROLE_USER) {
 	 *
 	 * @param User $user User to add
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function removeUser(User $user) {
 		$db = UserConfig::getDB();
@@ -628,15 +627,15 @@ public function removeUser(User $user) {
 
 		if ($stmt = $db->prepare('DELETE FROM u_account_users WHERE account_id = ? AND user_id = ?')) {
 			if (!$stmt->bind_param('ii', $this->id, $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -719,7 +718,7 @@ public function getNextSchedule() {
 	 *
 	 * @return Account Newly created account
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function createAccount($name, $plan_slug, $schedule_slug = null, $user = null, $role = self::ROLE_ADMIN, $engine_slug = null) {
 		$name = mb_convert_encoding($name, 'UTF-8');
@@ -727,16 +726,16 @@ public static function createAccount($name, $plan_slug, $schedule_slug = null, $
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('INSERT INTO u_accounts (name, plan_slug, schedule_slug, engine_slug) VALUES (?, ?, ?, ?)'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 
 		if (!$stmt->bind_param('ssss', $name, $plan_slug, $schedule_slug, $engine_slug)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$id = $stmt->insert_id;
@@ -771,8 +770,8 @@ public static function createPersonalAccount(User $user) {
 	 *
 	 * @return Account
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function getCurrentAccount(User $user) {
 		$db = UserConfig::getDB();
@@ -786,21 +785,21 @@ public static function getCurrentAccount(User $user) {
 				'INNER JOIN u_accounts a ON a.id = up.current_account_id ' .
 				'INNER JOIN u_account_users au ON a.id = au.account_id ' .
 				'WHERE up.user_id = ? AND au.user_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$id = null;
 
 		if (!$stmt->bind_param('ii', $userid, $userid)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $engine_slug, $active, $next_charge, $next_plan_slug, $next_schedule_slug, $next_engine_slug, $role)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		$stmt->fetch();
@@ -839,7 +838,7 @@ public static function getCurrentAccount(User $user) {
 	 *
 	 * @param User $user
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function setAsCurrent(User $user) {
 		$db = UserConfig::getDB();
@@ -862,15 +861,15 @@ public function setAsCurrent(User $user) {
 			$userid = $user->getID();
 
 			if (!$stmt->bind_param('ii', $this->id, $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt, "Can't update user preferences (set current account)");
+				throw new Exceptions\DBExecuteStmtException($db, $stmt, "Can't update user preferences (set current account)");
 			}
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db, "Can't update user preferences (set current account)");
+			throw new Exceptions\DBPrepareStmtException($db, "Can't update user preferences (set current account)");
 		}
 	}
 
@@ -938,19 +937,19 @@ private static function fillCharges($account_id) {
 
 		if (!($stmt = $db->prepare('SELECT date_time, amount FROM u_account_charge WHERE account_id = ? ' .
 				'ORDER BY date_time'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $account_id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($datetime, $amount)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		$charges = array();
@@ -969,7 +968,7 @@ private static function fillCharges($account_id) {
 	 *
 	 * @return boolean True if charge was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function paymentIsDue($refund = NULL) { // refund is almost the same, as general payment
 		if (is_null($this->schedule)) {
@@ -996,31 +995,31 @@ public function paymentIsDue($refund = NULL) { // refund is almost the same, as
 				$charge_amount -= $this->charges[$c]['amount'];
 
 				if (!($stmt = $db->prepare('DELETE FROM u_account_charge WHERE account_id = ?'))) {
-					throw new DBPrepareStmtException($db);
+					throw new Exceptions\DBPrepareStmtException($db);
 				}
 
 				if (!$stmt->bind_param('i', $this->id)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$this->charges = array();
 				$stmt->close();
 			} else { // We still owe to user
 				if (!($stmt = $db->prepare('UPDATE u_account_charge SET amount = ? WHERE account_id = ?'))) {
-					throw new DBPrepareStmtException($db);
+					throw new Exceptions\DBPrepareStmtException($db);
 				}
 
 				$amt = $this->charges[$c]['amount'] - $charge_amount;
 				if (!$stmt->bind_param('di', $amt, $this->id)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				// Put into the object
@@ -1041,15 +1040,15 @@ public function paymentIsDue($refund = NULL) { // refund is almost the same, as
 			$this->charges[] = $charge;
 
 			if (!($stmt = $db->prepare('INSERT INTO u_account_charge (account_id, date_time, amount) VALUES (?, ?, ?)'))) {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!$stmt->bind_param('isd', $this->id, $charge['datetime'], $charge['amount'])) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
@@ -1075,7 +1074,7 @@ public function paymentIsDue($refund = NULL) { // refund is almost the same, as
 	 *
 	 * @return boolean True if payment was successfully applied
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function paymentReceived($amount) {
 
@@ -1099,15 +1098,15 @@ public function paymentReceived($amount) {
 
 				if (!($stmt = $db->prepare('UPDATE u_account_charge SET amount = ? ' .
 						'WHERE account_id = ? and date_time = ?'))) {
-					throw new DBPrepareStmtException($db);
+					throw new Exceptions\DBPrepareStmtException($db);
 				}
 
 				if (!$stmt->bind_param('dis', $this->charges[$k]['amount'], $this->id, $this->charges[$k]['datetime'])) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$amount = 0;
@@ -1118,15 +1117,15 @@ public function paymentReceived($amount) {
 		foreach ($cleared as $n => $k) {
 
 			if (!($stmt = $db->prepare('DELETE FROM u_account_charge WHERE account_id = ? and date_time = ?'))) {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!$stmt->bind_param('is', $this->id, $k['datetime'])) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
@@ -1139,15 +1138,15 @@ public function paymentReceived($amount) {
 			$this->charges[] = $charge;
 
 			if (!($stmt = $db->prepare('INSERT INTO u_account_charge (account_id, date_time, amount) VALUES (?, ?, ?)'))) {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!$stmt->bind_param('isd', $this->id, $charge['datetime'], $charge['amount'])) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
@@ -1174,7 +1173,7 @@ public function paymentReceived($amount) {
 	 *
 	 * @return boolean True if activation was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function activatePlan($plan_slug, $schedule_slug = NULL, $engine_slug = NULL) {
 		if (!$plan_slug) {
@@ -1196,15 +1195,15 @@ public function activatePlan($plan_slug, $schedule_slug = NULL, $engine_slug = N
 		if (!$new_plan || !UserConfig::$useSubscriptions) {
 			if (!($stmt = $db->prepare('UPDATE u_accounts SET plan_slug = ?, schedule_slug = NULL, engine_slug = NULL, active = 1, next_charge = NULL, ' .
 					'next_plan_slug = NULL, next_schedule_slug = NULL, next_engine_slug = NULL WHERE id = ?'))) {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!$stmt->bind_param('si', $plan_slug, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$this->plan = $new_plan;
@@ -1233,7 +1232,7 @@ public function activatePlan($plan_slug, $schedule_slug = NULL, $engine_slug = N
 			$old_engine_slug = is_null($this->paymentEngine) ? NULL : $this->paymentEngine->getSlug();
 
 			if ($this->plan) {
-				$this->plan->deactivateHook($this->id, $plan_slug, $schedule_slug);
+				$this->plan->deactivateHook($this->id, $plan_slug, $schedule_slug, $engine_slug);
 			}
 
 			$this->plan = $new_plan;
@@ -1250,15 +1249,15 @@ public function activatePlan($plan_slug, $schedule_slug = NULL, $engine_slug = N
 			 */
 			if (!($stmt = $db->prepare('UPDATE u_accounts SET plan_slug = ?, schedule_slug = ?, engine_slug = ?, active = 1, next_charge = ?, ' .
 					'next_plan_slug = NULL, next_schedule_slug = NULL, next_engine_slug = NULL WHERE id = ?'))) {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!$stmt->bind_param('ssssi', $plan_slug, $schedule_slug, $engine_slug, $this->nextCharge, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$this->paymentIsDue();
@@ -1299,7 +1298,7 @@ public function deactivatePlan() {
 	 *
 	 * @return boolean True if successfully set the schedule
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function setPaymentSchedule($schedule_slug, $engine_slug) {
 
@@ -1317,15 +1316,15 @@ public function setPaymentSchedule($schedule_slug, $engine_slug) {
 			schedule_slug = ?, engine_slug = ?, next_charge = ?,
 			next_plan_slug = NULL, next_schedule_slug = NULL, next_engine_slug = NULL
 			WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('sssi', $schedule_slug, $engine_slug, $this->nextCharge, $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		// Bill user
@@ -1405,7 +1404,7 @@ public function isIndividual() {
 	 *
 	 * @return boolean True if successfully updated payment engine
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function setPaymentEngine($engine_slug) {
 		if ($engine_slug == NULL) {
@@ -1418,15 +1417,15 @@ public function setPaymentEngine($engine_slug) {
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET engine_slug = ? WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('si', $engine_slug, $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$this->lastTransactionID =
@@ -1463,7 +1462,7 @@ public function getBalance() {
 	 *
 	 * @return boolean True if request was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function planChangeRequest($plan_slug, $schedule_slug, $engine_slug) {
 		// Sanity checks
@@ -1516,15 +1515,15 @@ public function planChangeRequest($plan_slug, $schedule_slug, $engine_slug) {
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET next_plan_slug = ?, next_schedule_slug = ?, next_engine_slug = ? WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('sssi', $plan_slug, $schedule_slug, $engine_slug, $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$this->lastTransactionID =
@@ -1541,7 +1540,7 @@ public function planChangeRequest($plan_slug, $schedule_slug, $engine_slug) {
 	 *
 	 * @return boolean True if request was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function scheduleChangeRequest($schedule_slug, $engine_slug) {
 		$schedule = $this->plan->getPaymentScheduleBySlug($schedule_slug);
@@ -1571,15 +1570,15 @@ public function scheduleChangeRequest($schedule_slug, $engine_slug) {
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET next_plan_slug = plan_slug, next_schedule_slug = ?,
 					next_engine_slug = ? WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('ssi', $schedule_slug, $engine_slug, $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$this->lastTransactionID =
@@ -1592,7 +1591,7 @@ public function scheduleChangeRequest($schedule_slug, $engine_slug) {
 	 *
 	 * @return boolean True if suspension was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function suspend() {
 		$this->active = 0;
@@ -1600,15 +1599,15 @@ public function suspend() {
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET active = 0 WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		return TRUE;
@@ -1619,7 +1618,7 @@ public function suspend() {
 	 *
 	 * @return boolean True if activation was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function activate() {
 		$this->active = 1;
@@ -1627,15 +1626,15 @@ public function activate() {
 		$db = UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET active = 1 WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		return TRUE;
@@ -1655,7 +1654,7 @@ public function getLastTransactionID() {
 	 *
 	 * @return boolean True if cancellation was successful
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function cancelChangeRequest() {
 
@@ -1666,15 +1665,15 @@ public function cancelChangeRequest() {
 		if (!($stmt = $db->prepare('UPDATE u_accounts SET ' .
 				'next_plan_slug = NULL, next_schedule_slug = NULL, next_engine_slug = NULL ' .
 				'WHERE id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $this->id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$this->nextPlan = NULL;
diff --git a/classes/Admin/AdminMenu.php b/classes/Admin/AdminMenu.php
new file mode 100644
index 0000000..180b467
--- /dev/null
+++ b/classes/Admin/AdminMenu.php
@@ -0,0 +1,58 @@
+<?php
+namespace StartupAPI\Admin;
+
+/**
+ * Root element for admin UI menus
+ *
+ * @package StartupAPI
+ * @subpackage Admin
+ */
+class AdminMenu extends MenuElement {
+
+	/**
+	 * Creates a root element for admin menu, accepts only array of subelements
+	 *
+	 * @param MenuElement[] $sub_menus
+	 */
+	public function __construct($sub_menus = null) {
+		parent::__construct('admin', 'Admin', null, $sub_menus);
+	}
+
+	public function render() {
+		?><ul class="nav nav-list"><?php
+		$this->renderChildren();
+		?></ul><?php
+	}
+
+	public function matchSlug($slug) {
+		return false;
+	}
+
+	public function renderTopNav() {
+		foreach ($this->sub_menus as $menu) {
+			?><ul class="nav"><?php
+			$menu->renderTopNav();
+			?></ul><?php
+		}
+	}
+
+	public function renderBreadCrumbs($extra = null) {
+		?><ul class="breadcrumb"><?php
+		foreach ($this->sub_menus as $menu) {
+			$menu->renderBreadCrumbs($extra);
+		}
+
+		if (!is_null($extra)) {
+			?><li class="active"><span class="divider"> / </span><?php echo $extra ?></li><?php
+		}
+	}
+
+	public function renderTitle($extra = null) {
+		parent::renderTitle($extra);
+
+		if (!is_null($extra)) {
+			echo self::$titleSeparator . $extra;
+		}
+	}
+
+}
diff --git a/classes/Admin/Menu.php b/classes/Admin/Menu.php
new file mode 100644
index 0000000..df37e1e
--- /dev/null
+++ b/classes/Admin/Menu.php
@@ -0,0 +1,91 @@
+<?php
+namespace StartupAPI\Admin;
+
+/**
+ * Leaf menu item without subitems
+ *
+ * @package StartupAPI
+ * @subpackage Admin
+ */
+class Menu extends MenuElement {
+
+	/**
+	 * Creates a leaf menu item
+	 *
+	 * @param string $slug Slug
+	 * @param string $title Menu title
+	 * @param string $link Menu link
+	 * @param string $icon Twitter Bootstrap icon slug
+	 * @param boolean $enabled Enabled / disabled
+	 * @param string $disabled_message Message to display in tooltip on disabled menu
+	 */
+	public function __construct($slug, $title, $link, $icon = null, $enabled = true, $disabled_message = 'Coming soon') {
+		parent::__construct($slug, $title, $link, null, $icon, $enabled, $disabled_message);
+	}
+
+	public function render() {
+		if (is_null($this->link)) {
+			return;
+		}
+		if ($this->enabled) {
+			?>
+			<li<?php if ($this->active) { ?> class="active"<?php } ?>>
+				<a href="<?php echo $this->link ?>">
+					<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
+					<?php echo $this->title ?>
+				</a>
+			</li>
+			<?php
+		} else {
+			?>
+			<li class="disabled"<?php if (!is_null($this->disabled_message)) { ?> title="<?php echo $this->disabled_message ?>"<?php } ?>>
+				<a href="#">
+					<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
+					<?php echo $this->title ?>
+				</a>
+			</li>
+			<?php
+		}
+	}
+
+	public function renderTopNav() {
+		if (!$this->enabled) {
+			return;
+		}
+		?>
+		<li<?php if ($this->active) { ?> class="active"<?php } ?>>
+			<a href="<?php echo $this->link ?>">
+				<?php echo $this->title ?>
+			</a>
+		</li>
+		<?php
+	}
+
+	public function renderBreadCrumbs($extra = null) {
+		if ($this->active) {
+			if (is_null($extra)) {
+				?><li class="active"><?php echo $this->title ?></li><?php
+			} else {
+				if (is_null($this->sub_menus)) {
+					$link = $this->link;
+				} else if (count($this->sub_menus) > 0) {
+					$link = $this->sub_menus[0]->link;
+				}
+				?>
+				<li class="active">
+					<?php if (!is_null($link)) { ?>
+						<a href="<?php echo $link ?>">
+							<?php echo $this->title ?>
+						</a>
+						<?php
+					} else {
+						echo $this->title;
+					}
+					?>
+				</li>
+				<?php
+			}
+		}
+	}
+
+}
diff --git a/classes/Admin/MenuElement.php b/classes/Admin/MenuElement.php
new file mode 100644
index 0000000..5f72a0d
--- /dev/null
+++ b/classes/Admin/MenuElement.php
@@ -0,0 +1,170 @@
+<?php
+namespace StartupAPI\Admin;
+
+/**
+ * Abstract class representing the menu hierarchy elements
+ *
+ * Subclasses will represent particular levels of this hierarchy that behave differently
+ *
+ * @package StartupAPI
+ * @subpackage Admin
+ *
+ * @todo Add disabling sections of menus altogether
+ */
+abstract class MenuElement {
+
+	/**
+	 * @var string String that separates menu sections in the title of the page
+	 */
+	protected static $titleSeparator = ' / ';
+
+	/**
+	 * @var string Menu slug to be used to identify this particular menu element
+	 */
+	protected $slug;
+
+	/**
+	 * @var string Menu element display name
+	 */
+	protected $title;
+
+	/**
+	 * @var string Menu link for those elements that are clickable
+	 */
+	protected $link;
+
+	/**
+	 * @var MenuElement[] An array of child elements for elements that support children
+	 */
+	protected $sub_menus = array();
+
+	/**
+	 * @var string Icon slug
+	 */
+	protected $icon;
+
+	/**
+	 * @var boolean Whatever menu item is currently selected
+	 */
+	protected $active;
+
+	/**
+	 * @var boolean Whatever menu item is enabled or disabled
+	 */
+	protected $enabled;
+
+	/**
+	 * @var string Message to display if menu item is disabled
+	 */
+	protected $disabled_message;
+
+	/**
+	 * Creates a menu item
+	 *
+	 * Subclasses can call this constructor with subset of parameters they support
+	 *
+	 * @param string $slug Slug
+	 * @param string $title Menu title
+	 * @param string $link Menu link
+	 * @param MenuElement[] $sub_menus
+	 * @param string $icon Twitter Bootstrap icon slug
+	 * @param boolean $enabled Enabled / disabled
+	 * @param string $disabled_message Message to display in tooltip on disabled menu
+	 */
+	public function __construct($slug, $title, $link, $sub_menus = null, $icon = null, $enabled = true, $disabled_message = 'Coming soon') {
+		$this->slug = $slug;
+		$this->title = $title;
+		$this->link = $link;
+		$this->sub_menus = $sub_menus;
+		$this->icon = $icon;
+		$this->enabled = $enabled;
+		$this->disabled_message = $disabled_message;
+	}
+
+	/**
+	 * Renders menu item in HTML
+	 *
+	 * Implementations should render their own tags and call submenu's
+	 * renderChildren() function where supported
+	 */
+	abstract public function render();
+
+	/**
+	 * Renders children elements
+	 */
+	public function renderChildren() {
+		foreach ($this->sub_menus as $menu) {
+			$menu->render();
+		}
+	}
+
+	/**
+	 * Sets currently active menu elements based on a slug
+	 *
+	 * @param string $active_slug Slug of active menu element
+	 *
+	 * @return boolean Returns true if child is active so parent can also set itself to active state
+	 */
+	public function setActive($active_slug) {
+		if ($this->matchSlug($active_slug)) {
+			$this->active = true;
+
+			return true;
+		} else if (is_array($this->sub_menus)) {
+			foreach ($this->sub_menus as $menu) {
+				$this->active = $menu->setActive($active_slug);
+
+				if ($this->active) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Compares passed slug to this menu element's slug
+	 *
+	 * Primarily to be overriden in the root element that is not supposed to be matched
+	 *
+	 * @param string $slug Slug to match
+	 *
+	 * @return boolean Returns true if slugs match
+	 */
+	public function matchSlug($slug) {
+		return $this->slug == $slug;
+	}
+
+	/**
+	 * Renders top navigation bar element for this menu item
+	 */
+	public function renderTopNav() {
+
+	}
+
+	/**
+	 * Renders breadcrumbs for the node
+	 *
+	 * @param string $extra Extra string to attach to the end of breadcrumbs
+	 */
+	abstract public function renderBreadCrumbs($extra = null);
+
+	/**
+	 * Renders portion of page title for this menu element
+	 *
+	 * @param string $extra Extra item to be appended at the end
+	 */
+	public function renderTitle($extra = null) {
+		if ($this->active) {
+			echo self::$titleSeparator . $this->title;
+		}
+
+		if (!is_null($this->sub_menus) && is_array($this->sub_menus) && count($this->sub_menus) > 0) {
+			foreach ($this->sub_menus as $menu) {
+				$menu->renderTitle($extra);
+			}
+		}
+	}
+
+}
diff --git a/classes/Admin/MenuSection.php b/classes/Admin/MenuSection.php
new file mode 100644
index 0000000..c48af45
--- /dev/null
+++ b/classes/Admin/MenuSection.php
@@ -0,0 +1,99 @@
+<?php
+namespace StartupAPI\Admin;
+
+/**
+ * Menu section that holds multiple menus
+ *
+ * @package StartupAPI
+ * @subpackage Admin
+ */
+class MenuSection extends MenuElement {
+
+	public function render() {
+		?><li class="nav-header"> <?php echo $this->title ?></li><?php
+		$this->renderChildren();
+		?><li class="divider"></li><?php
+	}
+
+	public function renderTopNav() {
+		$enabled = false;
+		foreach ($this->sub_menus as $menu) {
+			if ($menu->enabled) {
+				$enabled = true;
+			}
+		}
+		$this->enabled = $enabled;
+
+		if (!$this->enabled) {
+			return;
+		}
+
+		if ($this->enabled) {
+			if (is_null($this->sub_menus)) {
+				$link = $this->link;
+			} else if (count($this->sub_menus) > 0) {
+				$link = $this->sub_menus[0]->link;
+			} else {
+				return;
+			}
+			?>
+			<li<?php if ($this->active) { ?> class="active"<?php } ?>>
+				<?php if (!is_null($link)) { ?>
+					<a href="<?php echo $link ?>">
+						<?php echo $this->title ?>
+					</a>
+					<?php
+				} else {
+					echo $this->title;
+				}
+				?>
+			</li>
+			<?php
+		} else {
+			?>
+			<li class="disabled">
+				<a href="#" class="disabled">
+					<?php echo $this->title; ?>
+				</a>
+			</li>
+			<?php
+		}
+	}
+
+	public function renderBreadCrumbs($extra = null) {
+		if ($this->active) {
+			if (is_null($this->sub_menus)) {
+				$link = $this->link;
+			} else if (count($this->sub_menus) > 0) {
+				$link = $this->sub_menus[0]->link;
+			}
+			?>
+			<li>
+				<?php if (!is_null($link)) { ?>
+					<a href="<?php echo $link ?>">
+						<?php if (!is_null($this->icon)) { ?><i class="icon-<?php echo $this->icon ?>"></i><?php } ?>
+						<?php echo $this->title ?>
+					</a>
+					<?php
+				} else {
+					if (!is_null($this->icon)) {
+						?>
+						<i class="icon-<?php echo $this->icon ?>"></i>
+						<?php
+					}
+					echo $this->title;
+				}
+
+				if (is_array($this->sub_menus)) {
+					?><span class="divider">/</span><?php
+			}
+				?>
+			</li>
+			<?php
+			foreach ($this->sub_menus as $menu) {
+				$menu->renderBreadCrumbs($extra);
+			}
+		}
+	}
+
+}
diff --git a/classes/AuthenticationModule.php b/classes/AuthenticationModule.php
index 47ae340..eef3887 100644
--- a/classes/AuthenticationModule.php
+++ b/classes/AuthenticationModule.php
@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/StartupAPIModule.php');
+namespace StartupAPI;
 
 /**
  * Abstract class that can be subclassed to implement StartupAPI Authentication modules/extensions
@@ -111,7 +110,7 @@ abstract public function processEditUser($user, $data);
 	 * @param User $user User to get credentials for
 	 * @return UserCredentials User credentials object specific to the module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	abstract public function getUserCredentials($user);
 
@@ -123,7 +122,7 @@ abstract public function getUserCredentials($user);
 	 * @return int Number of users who have connections through this provider
 	 * 	       Some modules might allow for multiple connections, but the user is only counted once
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	abstract public function getTotalConnectedUsers();
 
@@ -190,7 +189,7 @@ public function renderAutoLogoutForm($template_info) {
 	 *
 	 * @return array Array of date => count pairs for all dates that have users registered on that date
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getDailyRegistrations() {
 		$db = UserConfig::getDB();
@@ -199,13 +198,13 @@ public function getDailyRegistrations() {
 
 		if ($stmt = $db->prepare('SELECT CAST(regtime AS DATE) AS regdate, count(*) AS regs FROM u_users WHERE regmodule = ? GROUP BY regdate')) {
 			if (!$stmt->bind_param('s', $this->getID())) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($regdate, $regs)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -214,7 +213,7 @@ public function getDailyRegistrations() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $dailyregs;
@@ -231,108 +230,3 @@ public function isCompact() {
 	}
 
 }
-
-/**
- * Abstract authentication exception class for specific exceptions to subclass
- *
- * Comparing to regular exception, this one also stores a list of messages to be passed back to forms being rendered
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-abstract class AuthenticationException extends Exception {
-
-	/**
-	 * An associative array of error messages
-	 *
-	 * Each form is free to define it's own keys, usually to indicate
-	 * part of the form where error messages will be displayed.
-	 *
-	 * Values can also be linear arrays to allow for display of
-	 * multiple messages in the same location.
-	 *
-	 * @var array
-	 */
-	protected $errors;
-
-	/**
-	 * Creates an exception accepting the list of error messages as 3rd parameter
-	 *
-	 * Example:
-	 * <code>
-	 * $errors['email'][] = "Using example domain";
-	 * $errors['email'][] = "Verification email doesn't match";
-	 * throw new InputValidationException('Email validation failed', 0, $errors);
-	 * </code>
-	 *
-	 * @see InputValidationException
-	 *
-	 * @param string $string Exception message
-	 * @param int $code Excepton code
-	 * @param array $errors A list of error messages to be displayed to the user
-	 */
-	public function __construct($string, $code, $errors) {
-		parent::__construct($string, $code);
-		$this->errors = $errors;
-	}
-
-	/**
-	 * Returns a list of error messages to display
-	 *
-	 * @return array an array of error messages
-	 */
-	public function getErrors() {
-		return $this->errors;
-	}
-
-}
-
-/**
- * Exception thrown when form fields didn't pass validation
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-class InputValidationException extends AuthenticationException {
-
-}
-
-/**
- * Exception thrown when newly registered user already exists
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-class ExistingUserException extends AuthenticationException {
-
-}
-
-/**
- * Exception thrown when user account couldn't be created
- *
- * @todo Check if this is actually used or there is a valid use case for it.
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-class UserCreationException extends AuthenticationException {
-
-}
-
-/**
- * Class representing user credentials for particular module
- * Must be subclassed and implemented by module
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-abstract class UserCredentials {
-
-	/**
-	 * This method should return HTML representation of user credentials to be included in admin interface
-	 * Usually linking to user's public profile at the source service
-	 *
-	 * @return string HTML representation of user credentials
-	 */
-	public abstract function getHTML();
-}
diff --git a/classes/Badge.php b/classes/Badge.php
index ceefc6c..1ab4c99 100644
--- a/classes/Badge.php
+++ b/classes/Badge.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * This class represents gamification badges people can uses
@@ -259,7 +260,7 @@ public static function getByID($id) {
 	 *
 	 * @return array Array of user badges with badge IDs as keys and arrays of Badge object and maximum level as value
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUserBadges(User $user) {
 		$db = UserConfig::getDB();
@@ -270,13 +271,13 @@ public static function getUserBadges(User $user) {
 
 		if ($stmt = $db->prepare('SELECT badge_id, MAX(badge_level) as level, time FROM u_user_badges WHERE user_id = ? GROUP BY badge_id')) {
 			if (!$stmt->bind_param('i', $user_id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($id, $level, $time)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -285,7 +286,7 @@ public static function getUserBadges(User $user) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $user_badges;
@@ -296,7 +297,7 @@ public static function getUserBadges(User $user) {
 	 *
 	 * @return array Array of user counts for each level (0 if not present)
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCounts() {
 		$db = UserConfig::getDB();
@@ -305,13 +306,13 @@ public function getUserCounts() {
 
 		if ($stmt = $db->prepare('SELECT badge_level, count(user_id) as total FROM u_user_badges WHERE badge_id = ? GROUP BY badge_level')) {
 			if (!$stmt->bind_param('i', $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($level, $total)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -320,7 +321,7 @@ public function getUserCounts() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $counts;
@@ -335,7 +336,7 @@ public function getUserCounts() {
 	 *
 	 * @return User[] Array of users objects ordered by time
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getBadgeUsers($level = null, $pagenumber = 0, $perpage = 20) {
 		$db = UserConfig::getDB();
@@ -363,13 +364,13 @@ public function getBadgeUsers($level = null, $pagenumber = 0, $perpage = 20) {
 				$result = $stmt->bind_param('iiii', $this->id, $level, $start, $perpage);
 			}
 			if (!$result) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($user_id)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -378,7 +379,7 @@ public function getBadgeUsers($level = null, $pagenumber = 0, $perpage = 20) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$badge_users = User::getUsersByIDs($user_ids);
@@ -392,7 +393,7 @@ public function getBadgeUsers($level = null, $pagenumber = 0, $perpage = 20) {
 	 * @param User $user User who got a badge
 	 * @param int $level Badge level
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function registerForUser(User $user, $level) {
 		$db = UserConfig::getDB();
@@ -402,14 +403,14 @@ public function registerForUser(User $user, $level) {
 		if ($stmt = $db->prepare('INSERT IGNORE INTO u_user_badges
 									(user_id, badge_id, badge_level) VALUES (?, ?, ?)')) {
 			if (!$stmt->bind_param('iii', $user_id, $this->id, $level)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt, "Can't register a badge for a user");
+				throw new Exceptions\DBExecuteStmtException($db, $stmt, "Can't register a badge for a user");
 			}
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db, "Can't register a badge for a user");
+			throw new Exceptions\DBPrepareStmtException($db, "Can't register a badge for a user");
 		}
 	}
 
@@ -438,57 +439,3 @@ public static function triggerActivityBadge(User $user, $activity_id) {
 	}
 
 }
-
-/**
- * Basic data structure to hold information about activity triggers
- *
- * @package StartupAPI
- * @subpackage Gamification
- *
- * @internal Used only for data management in Badge class
- */
-class BadgeActivityTrigger {
-
-	/**
-	 * @var Badge Badge to give if triggered
-	 */
-	public $badge;
-
-	/**
-	 * @var int[] Array of activity IDs that would activate the trigger
-	 */
-	public $activity_ids = array();
-
-	/**
-	 * @var int Number of activities to activate the trigger
-	 */
-	public $activity_count = 0;
-
-	/**
-	 * @var int Badge level to grant if triggered
-	 */
-	public $badge_level = 1;
-
-	/**
-	 * @var int Amount of days in activity window to cause the trigger
-	 */
-	public $activity_period = null;
-
-	/**
-	 * Creates a badge activity trigger
-	 *
-	 * @param Badge $badge Badge to give if triggered
-	 * @param int[] $activity_ids Array of activity IDs that would activate the trigger
-	 * @param int $activity_count Number of activities to activate the trigger
-	 * @param int $badge_level Badge level to grant if triggered
-	 * @param int $activity_period Amount of days in activity window to cause the trigger
-	 */
-	public function __construct($badge, $activity_ids, $activity_count, $badge_level, $activity_period = null) {
-		$this->badge = $badge;
-		$this->activity_ids = $activity_ids;
-		$this->activity_count = $activity_count;
-		$this->badge_level = $badge_level;
-		$this->activity_period = $activity_period;
-	}
-
-}
diff --git a/classes/BadgeActivityTrigger.php b/classes/BadgeActivityTrigger.php
new file mode 100644
index 0000000..9b3c443
--- /dev/null
+++ b/classes/BadgeActivityTrigger.php
@@ -0,0 +1,56 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * Basic data structure to hold information about activity triggers
+ *
+ * @package StartupAPI
+ * @subpackage Gamification
+ *
+ * @internal Used only for data management in Badge class
+ */
+class BadgeActivityTrigger {
+
+	/**
+	 * @var Badge Badge to give if triggered
+	 */
+	public $badge;
+
+	/**
+	 * @var int[] Array of activity IDs that would activate the trigger
+	 */
+	public $activity_ids = array();
+
+	/**
+	 * @var int Number of activities to activate the trigger
+	 */
+	public $activity_count = 0;
+
+	/**
+	 * @var int Badge level to grant if triggered
+	 */
+	public $badge_level = 1;
+
+	/**
+	 * @var int Amount of days in activity window to cause the trigger
+	 */
+	public $activity_period = null;
+
+	/**
+	 * Creates a badge activity trigger
+	 *
+	 * @param Badge $badge Badge to give if triggered
+	 * @param int[] $activity_ids Array of activity IDs that would activate the trigger
+	 * @param int $activity_count Number of activities to activate the trigger
+	 * @param int $badge_level Badge level to grant if triggered
+	 * @param int $activity_period Amount of days in activity window to cause the trigger
+	 */
+	public function __construct($badge, $activity_ids, $activity_count, $badge_level, $activity_period = null) {
+		$this->badge = $badge;
+		$this->activity_ids = $activity_ids;
+		$this->activity_count = $activity_count;
+		$this->badge_level = $badge_level;
+		$this->activity_period = $activity_period;
+	}
+
+}
diff --git a/classes/CampaignTracker.php b/classes/CampaignTracker.php
index e8f5fb7..483bee1 100644
--- a/classes/CampaignTracker.php
+++ b/classes/CampaignTracker.php
@@ -1,5 +1,5 @@
 <?php
-require_once(__DIR__.'/CookieStorage.php');
+namespace StartupAPI;
 
 /**
  * Tracks sources of marketing campaigns using variables in the incoming URLs
@@ -45,7 +45,7 @@ class CampaignTracker
 	 *
 	 * This function is called on every page view, let's keep it fast and simple.
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 *
 	 * @see UserConfig::$campaign_variables
 	 */
@@ -75,7 +75,7 @@ public static function recordCampaignVariables() {
 		));
 
 		if (!$storage->store(UserConfig::$entry_cmp_key, serialize($campaign))) {
-			throw new StartupAPIException(implode("\n", $storage->errors));
+			throw new Exceptions\StartupAPIException(implode("\n", $storage->errors));
 		}
 	}
 
@@ -87,7 +87,7 @@ public static function recordCampaignVariables() {
 	 *
 	 * This function is called on every page view, let's keep it fast and simple.
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public static function preserveReferer() {
 		if (array_key_exists('HTTP_REFERER', $_SERVER)) {
@@ -107,7 +107,7 @@ public static function preserveReferer() {
 			));
 
 			if (!$storage->store(UserConfig::$entry_referer_key, $referer)) {
-				throw new StartupAPIException(implode("\n", $storage->errors));
+				throw new Exceptions\StartupAPIException(implode("\n", $storage->errors));
 			}
 
 			self::$referer = $referer;
@@ -163,7 +163,7 @@ public static function getCampaign() {
 	 *
 	 * @return int Numeric campaign source ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaignSourceID($source) {
 		return self::getCampaignDictionaryID($source, 'cmp_source', 'source');
@@ -176,7 +176,7 @@ public static function getCampaignSourceID($source) {
 	 *
 	 * @return int Numeric campaign medium ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaignMediumID($medium) {
 		return self::getCampaignDictionaryID($medium, 'cmp_medium', 'medium');
@@ -188,7 +188,7 @@ public static function getCampaignMediumID($medium) {
 	 *
 	 * @return int Numeric campaign keywords ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaignKeywordsID($keywords) {
 		return self::getCampaignDictionaryID($keywords, 'cmp_keywords', 'keywords');
@@ -201,7 +201,7 @@ public static function getCampaignKeywordsID($keywords) {
 	 *
 	 * @return int Numeric campaign content ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaignContentID($content) {
 		return self::getCampaignDictionaryID($content, 'cmp_content', 'content');
@@ -214,7 +214,7 @@ public static function getCampaignContentID($content) {
 	 *
 	 * @return int Numeric campaign name ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaignNameID($name) {
 		return self::getCampaignDictionaryID($name, 'cmp', 'name');
@@ -231,7 +231,7 @@ public static function getCampaignNameID($name) {
 	 *
 	 * @return int Numeric ID for a dictionary term
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	protected static function getCampaignDictionaryID($string_value, $dictionary_table, $dictionary_column) {
 		$string_value = mb_convert_encoding($string_value, 'UTF-8');
@@ -242,17 +242,17 @@ protected static function getCampaignDictionaryID($string_value, $dictionary_tab
 		{
 			if (!$stmt->bind_param('s', $string_value))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt, "Can't insert compaign $dictionary_column");
+				throw new Exceptions\DBExecuteStmtException($db, $stmt, "Can't insert compaign $dictionary_column");
 			}
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db, "Can't insert compaign $dictionary_column");
+			throw new Exceptions\DBPrepareStmtException($db, "Can't insert compaign $dictionary_column");
 		}
 
 		$id = null;
@@ -260,15 +260,15 @@ protected static function getCampaignDictionaryID($string_value, $dictionary_tab
 		{
 			if (!$stmt->bind_param('s', $string_value))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($id))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -276,7 +276,7 @@ protected static function getCampaignDictionaryID($string_value, $dictionary_tab
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $id;
diff --git a/classes/Clock.php b/classes/Clock.php
index 90d2405..e5ed4a3 100644
--- a/classes/Clock.php
+++ b/classes/Clock.php
@@ -1,5 +1,9 @@
 <?php
+namespace StartupAPI;
 
+/**
+ * @package StartupAPI
+ */
 class Clock {
   static protected $instance;
 
@@ -35,28 +39,3 @@ static function addTime( $interval )
     else throw new Exception ('programming error: cannot add time to RealClock instance' );
   }
 }
-
-class RealClock extends Clock {
-  function _getDateTime()
-  {
-    return new DateTime();
-  }
-}
-
-class ModelledClock extends Clock {
-  private $datetime;
-
-  function __construct() {
-    $this -> datetime = new DateTime( '00010101T000000' );
-  }
-
-  function _getDateTime()
-  {
-    return $this -> datetime;
-  }
-
-  function _addTime( $date_interval )
-  {
-    $this -> datetime -> add( new DateInterval ( $date_interval ));
-  }
-}
diff --git a/classes/Cohort.php b/classes/Cohort.php
deleted file mode 100644
index 561057a..0000000
--- a/classes/Cohort.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-/**
- * Represents a group of users in the system
- *
- * @package StartupAPI
- * @subpackage Analytics\CohortAnalysis
- */
-class Cohort {
-	/**
-	 * @var string Cohort identifier to be used in query string parameters and slugs
-	 */
-	private $id;
-	/**
-	 * @var string Cohort display name
-	 */
-	private $title;
-	/**
-	 * @var int Total number of members in the cohort
-	 */
-	private $total;
-
-	/**
-	 * Creates new cohort
-	 *
-	 * @param string $id Cohort ID string
-	 * @param string $title Cohort display name
-	 * @param int $total Total number of members
-	 */
-	public function __construct($id, $title, $total) {
-		$this->id = $id;
-		$this->title = $title;
-		$this->total = $total;
-	}
-
-	/**
-	 * Returns cohort ID string
-	 *
-	 * @return string
-	 */
-	public function getID() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns cohort display name
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	/**
-	 * Returns total number of members in the cohort
-	 *
-	 * @return int
-	 */
-	public function getTotal() {
-		return $this->total;
-	}
-}
-
-/**
- * Defines a method to break down all users into cohorts
- *
- * Whatever you want to split them by registration date, by gender or by salary
- * range, just subclass this class and add it to UserConfig::$cohort_providers array
- *
- * <code>
- * UserConfig::$cohort_providers[] = new MyOwnCohortProvider();
- * </code>
- *
- * @package StartupAPI
- * @subpackage Analytics\CohortAnalysis
- *
- * @see UserConfig::$cohort_providers
- */
-abstract class CohortProvider {
-	/**
-	 * @var string Cohort provider ID string
-	 */
-	private $id;
-	/**
-	 * @var string Cohort provider display name
-	 */
-	private $title;
-
-	/**
-	 * Whatever or not cohorts created by this provider create a sequence
-	 * and have previous cohort to compare to.
-	 *
-	 * Most of cohort lists don't create cohorts that are sequential, no reason to compare them
-	 *
-	 * @var boolean
-	 */
-	protected $compare_to_previous_cohort = false;
-
-	/**
-	 * Creates a cohort provider object
-	 *
-	 * Add them to UserConfig::$cohort_providers[] array to be used in admin UI
-	 *
-	 * @param string $id ID of the provider
-	 * @param string $title Display name of the provider
-	 *
-	 * @see UserConfig::$cohort_providers
-	 */
-	public function __construct($id, $title) {
-		$this->id = $id;
-		$this->title = $title;
-	}
-
-	/**
-	 * Returns provider ID
-	 *
-	 * @return string Provider ID
-	 */
-	public function getID() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns provider display name
-	 *
-	 * @return string Provider display name
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	/**
-	 * Returns the cohort comparison flag
-	 *
-	 * @return boolean Can we compare to previous cohort or not
-	 */
-	public function canCompareToPreviousCohort() {
-		return $this->compare_to_previous_cohort;
-	}
-
-	/**
-	 * Returns a list of cohorts tracked by specific CohortProvider
-	 *
-	 * @return array $cohorts an array of Cohort objects
-	 */
-	public abstract function getCohorts();
-
-	/**
-	 * Returns the name of dimension this provider separates users by (e.g. "registration date" or "gender")
-	 *
-	 * @return string Name of the dimension
-	 */
-	public abstract function getDimensionTitle();
-
-	/**
-	 * Returns a number of users who performed each activity for each period (specified the activity period length)
-	 *
-	 * If activity ID is provided, returns levels only for specific activity, otherwise for all activities.
-	 *
-	 * @param int $activityid Activity ID (null for all activities)
-	 * @param int $actnum Number of days in activity period
-	 *
-	 * @return array Two dimensional array of buckets by cohort_id and activity period as keys and number of users in the bucket as values
-	 *
-	 * @throws DBException
-	 */
-	public function getActivityRate($activityid, $actnum)
-	{
-		$db = UserConfig::getDB();
-
-		$siteadminsstring = null;
-		if (count(UserConfig::$admins) > 0) {
-			$siteadminsstring = implode(", ", UserConfig::$admins);
-		}
-
-		$aggregates = array();
-
-		$query = 'SELECT u.cohort_id AS cohort_id,
-			FLOOR(DATEDIFF(a.time, u.regtime) / ?) AS actperiod,
-			COUNT(DISTINCT u.id) AS total
-			FROM `u_activity` AS a
-				INNER JOIN ('.$this->getCohortSQL().') AS u
-					ON a.user_id = u.id';
-		if (!is_null($activityid)) {
-			$query .= '	WHERE `activity_id` = ?';
-		}
-
-		if (!is_null($siteadminsstring)) {
-			$query .= "\nAND u.id NOT IN ($siteadminsstring)";
-		}
-
-		$query .= '
-			GROUP BY cohort_id, actperiod
-			ORDER BY actperiod ASC';
-
-		if ($stmt = $db->prepare($query))
-		{
-			if (!is_null($activityid)) {
-				if (!$stmt->bind_param('ii', $actnum, $activityid))
-				{
-					throw new DBBindParamException($db, $stmt);
-				}
-			} else {
-				if (!$stmt->bind_param('i', $actnum))
-				{
-					throw new DBBindParamException($db, $stmt);
-				}
-			}
-			if (!$stmt->execute())
-			{
-				throw new DBExecuteStmtException($db, $stmt);
-			}
-			if (!$stmt->bind_result($cohort_id, $actperiod, $activeusers))
-			{
-				throw new DBBindResultException($db, $stmt);
-			}
-
-			while($stmt->fetch() === TRUE)
-			{
-				$aggregates[$cohort_id][$actperiod] = $activeusers;
-			}
-
-			$stmt->close();
-		}
-		else
-		{
-			throw new DBPrepareStmtException($db);
-		}
-
-		return $aggregates;
-	}
-
-	/**
-	 * Returns SQL statement used to separate users into cohorts
-	 *
-	 * Subclasses must override this method and provide an SQL statement returning 3 columns:
-	 * - id (ser ID, from users table)
-	 * - re_time (user registration datetime, from users table)
-	 * - cohort_id (cohort ID specific to your provider
-	 *
-	 * Where cohort_id is the main information provided by this method
-	 * and used to put users into different buckets.
-	 */
-	abstract function getCohortSQL();
-
-}
-
-/**
- * This class allows dropping users into cohorts by registration date
- *
- * @package StartupAPI
- * @subpackage Analytics\CohortAnalysis
- */
-class GenerationCohorts extends CohortProvider {
-	/**
-	 * @var int DescriptionDefines a period constant: year
-	 */
-	const YEAR = 0;
-	/**
-	 * @var int Defines a period constant: month
-	 */
-	const MONTH = 1;
-	/**
-	 * @var int Defines a period constant: week
-	 */
-	const WEEK = 2;
-
-	/**
-	 * A period of time between generations
-	 *
-	 * @var int One of GenerationCohorts::YEAR, GenerationCohorts::MONTH or GenerationCohorts::WEEK
-	 */
-	private $period;
-
-	/**
-	 * Creates a cohort provider to separate users by generation
-	 *
-	 * Most commonly used for analysis, usually for month-to-month comparison
-	 *
-	 * @param int $period One of GenerationCohorts::YEAR, GenerationCohorts::MONTH (default) or GenerationCohorts::WEEK
-	 *
-	 * @throws StartupAPIException
-	 */
-	public function __construct($period = self::MONTH) {
-		$title = 'User genrations by ';
-		$id = 'gen';
-
-		switch ($period) {
-			case self::MONTH:
-				$title .= "month";
-				$id .= "month";
-				break;
-			case self::YEAR:
-				$title .= "year";
-				$id .= "year";
-				break;
-			case self::WEEK:
-				$title .= "week";
-				$id .= "week";
-				break;
-			default:
-				throw new StartupAPIException('Wrong generation period');
-		}
-
-		parent::__construct($id, $title);
-
-		// cohorts are chronological so it makes sense to compare to previous
-		$this->compare_to_previous_cohort = true;
-
-		$this->period = $period;
-	}
-
-	/**
-	 * Always returns "Reg. date"
-	 *
-	 * @return string
-	 */
-	public function getDimensionTitle() {
-		return 'Reg. date';
-	}
-
-	/**
-	 * Returns a list of generation cohorts for all generations of users registered so far
-	 *
-	 * @return array $cohorts An array of Cohort objects for each generation
-	 *
-	 * @throws StartupAPIException
-	 * @throws DBException
-	 */
-	public function getCohorts() {
-		$db = UserConfig::getDB();
-
-		// an array of cohorts to return
-		$cohorts = array();
-
-		/**
-		 * The query must return a unique cohort_id, title and total members
-		 */
-		switch ($this->period) {
-			case self::MONTH:
-				$query = "SELECT EXTRACT(YEAR_MONTH FROM regtime) AS cohort_id,
-					DATE_FORMAT(regtime, '%b %Y') AS title,
-					COUNT(*) AS totals
-					FROM u_users";
-				break;
-			case self::YEAR:
-				$query = "SELECT YEAR(regtime) AS cohort_id,
-					YEAR(regtime) AS title,
-					COUNT(*) AS totals
-					FROM u_users";
-				break;
-			case self::WEEK:
-				$query = "SELECT YEARWEEK(regtime) AS cohort_id,
-					CONCAT(
-						DATE_FORMAT(
-							DATE(DATE_SUB(regtime, INTERVAL WEEKDAY(regtime) DAY)),
-							'%b %e, %Y'
-						), ' - ',
-						DATE_FORMAT(
-							DATE(DATE_ADD(regtime, INTERVAL 6-WEEKDAY(regtime) DAY)),
-							'%b %e, %Y'
-						)
-					) AS title,
-					COUNT(*) AS totals
-					FROM u_users";
-				break;
-			default:
-				throw new StartupAPIException('Wrong generation period');
-		}
-
-		// Excluding site administrators
-		if (count(UserConfig::$admins) > 0) {
-			$query .= "\nWHERE id NOT IN (" . implode(", ", UserConfig::$admins) . ")";
-		}
-
-		$query .= ' GROUP BY cohort_id ORDER BY regtime DESC';
-
-		if ($stmt = $db->prepare($query))
-		{
-			if (!$stmt->execute())
-			{
-				throw new DBExecuteStmtException($db, $stmt);
-			}
-			if (!$stmt->bind_result($cohort_id, $title, $total))
-			{
-				throw new DBBindResultException($db, $stmt);
-			}
-
-			while($stmt->fetch() === TRUE)
-			{
-				$cohorts[] = new Cohort($cohort_id, $title, $total);
-			}
-			$stmt->close();
-		}
-		else
-		{
-			throw new DBPrepareStmtException($db);
-		}
-
-		return $cohorts;
-	}
-
-	/**
-	 * SQL statement for separation of users into generations
-	 *
-	 * @return string SQL statement for generating a resultset with id, regtime and cohort_id
-	 *
-	 * @throws StartupAPIException
-	 */
-	public function getCohortSQL() {
-		switch ($this->period) {
-			case self::MONTH:
-				$query = 'SELECT id, regtime, EXTRACT(YEAR_MONTH FROM regtime) AS cohort_id
-					FROM u_users';
-				break;
-			case self::YEAR:
-				$query = 'SELECT id, regtime, YEAR(regtime) AS cohort_id
-					FROM u_users';
-				break;
-			case self::WEEK:
-				$query = 'SELECT id, regtime, YEARWEEK(regtime) AS cohort_id
-					FROM u_users';
-				break;
-			default:
-				throw new StartupAPIException('Wrong generation period');
-		}
-
-		return $query;
-	}
-}
-
-/**
- * This class allows dropping users into cohorts by registration method / module
- *
- * @package StartupAPI
- * @subpackage Analytics\CohortAnalysis
- */
-class RegMethodCohorts extends CohortProvider {
-	/**
-	 * Creates new cohort provider based on user's method of registration (Authentication Module)
-	 */
-	public function __construct() {
-		parent::__construct('byregmethod', 'Users registration method');
-	}
-
-	/**
-	 * Always returns "Reg. module"
-	 *
-	 * @return string "Reg. module"
-	 */
-	public function getDimensionTitle() {
-		return 'Reg. module';
-	}
-
-	/**
-	 * Returns a list of registration module cohorts for all modules users actually regusterd with
-	 *
-	 * @return array $cohorts An array of Cohort objects
-	 *
-	 * @throws DBException
-	 */
-	public function getCohorts() {
-		$db = UserConfig::getDB();
-
-		$cohort_titles = array();
-
-		foreach (UserConfig::$authentication_modules as $module) {
-			$cohort_titles[$module->getID()] = $module->getTitle();
-		}
-
-		/**
-		 * The query must return a unique cohort_id, title and total members
-		 */
-		$query = 'SELECT regmodule AS cohort_id, COUNT(*) AS totals FROM u_users';
-
-		$siteadminsstring = null;
-		if (count(UserConfig::$admins) > 0) {
-			$siteadminsstring = implode(", ", UserConfig::$admins);
-		}
-
-		if (!is_null($siteadminsstring)) {
-			$query .= "\nWHERE id NOT IN ($siteadminsstring)";
-		}
-
-		$cohorts = array();
-
-		$query .= ' GROUP BY cohort_id ORDER BY regtime DESC';
-
-		if ($stmt = $db->prepare($query))
-		{
-			if (!$stmt->execute())
-			{
-				throw new DBExecuteStmtException($db, $stmt);
-			}
-			if (!$stmt->bind_result($cohort_id, $total))
-			{
-				throw new DBBindResultException($db, $stmt);
-			}
-
-			while($stmt->fetch() === TRUE)
-			{
-				$cohorts[] = new Cohort($cohort_id, $cohort_titles[$cohort_id], $total);
-			}
-			$stmt->close();
-		}
-		else
-		{
-			throw new DBPrepareStmtException($db);
-		}
-
-		return $cohorts;
-	}
-
-	/**
-	 * SQL statement for separation of users into buckets by registration module
-	 *
-	 * @return string SQL statement for generating a resultset with id, regtime and cohort_id
-	 */
-	public function getCohortSQL() {
-		return 'SELECT id, regtime, regmodule AS cohort_id FROM u_users';
-	}
-}
diff --git a/classes/CohortAnalysis/Cohort.php b/classes/CohortAnalysis/Cohort.php
new file mode 100644
index 0000000..3a02c37
--- /dev/null
+++ b/classes/CohortAnalysis/Cohort.php
@@ -0,0 +1,63 @@
+<?php
+namespace StartupAPI\CohortAnalysis;
+
+/**
+ * Represents a group of users in the system
+ *
+ * @package StartupAPI
+ * @subpackage Analytics\CohortAnalysis
+ */
+class Cohort {
+	/**
+	 * @var string Cohort identifier to be used in query string parameters and slugs
+	 */
+	private $id;
+	/**
+	 * @var string Cohort display name
+	 */
+	private $title;
+	/**
+	 * @var int Total number of members in the cohort
+	 */
+	private $total;
+
+	/**
+	 * Creates new cohort
+	 *
+	 * @param string $id Cohort ID string
+	 * @param string $title Cohort display name
+	 * @param int $total Total number of members
+	 */
+	public function __construct($id, $title, $total) {
+		$this->id = $id;
+		$this->title = $title;
+		$this->total = $total;
+	}
+
+	/**
+	 * Returns cohort ID string
+	 *
+	 * @return string
+	 */
+	public function getID() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns cohort display name
+	 *
+	 * @return string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
+	/**
+	 * Returns total number of members in the cohort
+	 *
+	 * @return int
+	 */
+	public function getTotal() {
+		return $this->total;
+	}
+}
diff --git a/classes/CohortAnalysis/CohortProvider.php b/classes/CohortAnalysis/CohortProvider.php
new file mode 100644
index 0000000..eac5628
--- /dev/null
+++ b/classes/CohortAnalysis/CohortProvider.php
@@ -0,0 +1,186 @@
+<?php
+namespace StartupAPI\CohortAnalysis;
+
+/**
+ * Defines a method to break down all users into cohorts
+ *
+ * Whatever you want to split them by registration date, by gender or by salary
+ * range, just subclass this class and add it to UserConfig::$cohort_providers array
+ *
+ * <code>
+ * UserConfig::$cohort_providers[] = new MyOwnCohortProvider();
+ * </code>
+ *
+ * @package StartupAPI
+ * @subpackage Analytics\CohortAnalysis
+ *
+ * @see UserConfig::$cohort_providers
+ */
+abstract class CohortProvider {
+	/**
+	 * @var string Cohort provider ID string
+	 */
+	private $id;
+	/**
+	 * @var string Cohort provider display name
+	 */
+	private $title;
+
+	/**
+	 * Whatever or not cohorts created by this provider create a sequence
+	 * and have previous cohort to compare to.
+	 *
+	 * Most of cohort lists don't create cohorts that are sequential, no reason to compare them
+	 *
+	 * @var boolean
+	 */
+	protected $compare_to_previous_cohort = false;
+
+	/**
+	 * Creates a cohort provider object
+	 *
+	 * Add them to UserConfig::$cohort_providers[] array to be used in admin UI
+	 *
+	 * @param string $id ID of the provider
+	 * @param string $title Display name of the provider
+	 *
+	 * @see UserConfig::$cohort_providers
+	 */
+	public function __construct($id, $title) {
+		$this->id = $id;
+		$this->title = $title;
+	}
+
+	/**
+	 * Returns provider ID
+	 *
+	 * @return string Provider ID
+	 */
+	public function getID() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns provider display name
+	 *
+	 * @return string Provider display name
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
+	/**
+	 * Returns the cohort comparison flag
+	 *
+	 * @return boolean Can we compare to previous cohort or not
+	 */
+	public function canCompareToPreviousCohort() {
+		return $this->compare_to_previous_cohort;
+	}
+
+	/**
+	 * Returns a list of cohorts tracked by specific CohortProvider
+	 *
+	 * @return array $cohorts an array of Cohort objects
+	 */
+	public abstract function getCohorts();
+
+	/**
+	 * Returns the name of dimension this provider separates users by (e.g. "registration date" or "gender")
+	 *
+	 * @return string Name of the dimension
+	 */
+	public abstract function getDimensionTitle();
+
+	/**
+	 * Returns a number of users who performed each activity for each period (specified the activity period length)
+	 *
+	 * If activity ID is provided, returns levels only for specific activity, otherwise for all activities.
+	 *
+	 * @param int $activityid Activity ID (null for all activities)
+	 * @param int $actnum Number of days in activity period
+	 *
+	 * @return array Two dimensional array of buckets by cohort_id and activity period as keys and number of users in the bucket as values
+	 *
+	 * @throws Exceptions\DBException
+	 */
+	public function getActivityRate($activityid, $actnum)
+	{
+		$db = \StartupAPI\UserConfig::getDB();
+
+		$siteadminsstring = null;
+		if (count(\StartupAPI\UserConfig::$admins) > 0) {
+			$siteadminsstring = implode(", ", \StartupAPI\UserConfig::$admins);
+		}
+
+		$aggregates = array();
+
+		$query = 'SELECT u.cohort_id AS cohort_id,
+			FLOOR(DATEDIFF(a.time, u.regtime) / ?) AS actperiod,
+			COUNT(DISTINCT u.id) AS total
+			FROM `u_activity` AS a
+				INNER JOIN ('.$this->getCohortSQL().') AS u
+					ON a.user_id = u.id';
+		if (!is_null($activityid)) {
+			$query .= '	WHERE `activity_id` = ?';
+		}
+
+		if (!is_null($siteadminsstring)) {
+			$query .= "\nAND u.id NOT IN ($siteadminsstring)";
+		}
+
+		$query .= '
+			GROUP BY cohort_id, actperiod
+			ORDER BY actperiod ASC';
+
+		if ($stmt = $db->prepare($query))
+		{
+			if (!is_null($activityid)) {
+				if (!$stmt->bind_param('ii', $actnum, $activityid))
+				{
+					throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
+				}
+			} else {
+				if (!$stmt->bind_param('i', $actnum))
+				{
+					throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
+				}
+			}
+			if (!$stmt->execute())
+			{
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
+			}
+			if (!$stmt->bind_result($cohort_id, $actperiod, $activeusers))
+			{
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
+			}
+
+			while($stmt->fetch() === TRUE)
+			{
+				$aggregates[$cohort_id][$actperiod] = $activeusers;
+			}
+
+			$stmt->close();
+		}
+		else
+		{
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
+		}
+
+		return $aggregates;
+	}
+
+	/**
+	 * Returns SQL statement used to separate users into cohorts
+	 *
+	 * Subclasses must override this method and provide an SQL statement returning 3 columns:
+	 * - id (ser ID, from users table)
+	 * - re_time (user registration datetime, from users table)
+	 * - cohort_id (cohort ID specific to your provider
+	 *
+	 * Where cohort_id is the main information provided by this method
+	 * and used to put users into different buckets.
+	 */
+	abstract function getCohortSQL();
+
+}
diff --git a/classes/CohortAnalysis/GenerationCohorts.php b/classes/CohortAnalysis/GenerationCohorts.php
new file mode 100644
index 0000000..42ff3c7
--- /dev/null
+++ b/classes/CohortAnalysis/GenerationCohorts.php
@@ -0,0 +1,186 @@
+<?php
+namespace StartupAPI\CohortAnalysis;
+
+/**
+ * This class allows dropping users into cohorts by registration date
+ *
+ * @package StartupAPI
+ * @subpackage Analytics\CohortAnalysis
+ */
+class GenerationCohorts extends CohortProvider {
+	/**
+	 * @var int DescriptionDefines a period constant: year
+	 */
+	const YEAR = 0;
+	/**
+	 * @var int Defines a period constant: month
+	 */
+	const MONTH = 1;
+	/**
+	 * @var int Defines a period constant: week
+	 */
+	const WEEK = 2;
+
+	/**
+	 * A period of time between generations
+	 *
+	 * @var int One of GenerationCohorts::YEAR, GenerationCohorts::MONTH or GenerationCohorts::WEEK
+	 */
+	private $period;
+
+	/**
+	 * Creates a cohort provider to separate users by generation
+	 *
+	 * Most commonly used for analysis, usually for month-to-month comparison
+	 *
+	 * @param int $period One of GenerationCohorts::YEAR, GenerationCohorts::MONTH (default) or GenerationCohorts::WEEK
+	 *
+	 * @throws \StartupAPI\Exceptions\StartupAPIException
+	 */
+	public function __construct($period = self::MONTH) {
+		$title = 'User genrations by ';
+		$id = 'gen';
+
+		switch ($period) {
+			case self::MONTH:
+				$title .= "month";
+				$id .= "month";
+				break;
+			case self::YEAR:
+				$title .= "year";
+				$id .= "year";
+				break;
+			case self::WEEK:
+				$title .= "week";
+				$id .= "week";
+				break;
+			default:
+				throw new \StartupAPI\Exceptions\StartupAPIException('Wrong generation period');
+		}
+
+		parent::__construct($id, $title);
+
+		// cohorts are chronological so it makes sense to compare to previous
+		$this->compare_to_previous_cohort = true;
+
+		$this->period = $period;
+	}
+
+	/**
+	 * Always returns "Reg. date"
+	 *
+	 * @return string
+	 */
+	public function getDimensionTitle() {
+		return 'Reg. date';
+	}
+
+	/**
+	 * Returns a list of generation cohorts for all generations of users registered so far
+	 *
+	 * @return array $cohorts An array of Cohort objects for each generation
+	 *
+	 * @throws \StartupAPI\Exceptions\StartupAPIException
+	 * @throws \StartupAPI\Exceptions\DBException
+	 */
+	public function getCohorts() {
+		$db = \StartupAPI\UserConfig::getDB();
+
+		// an array of cohorts to return
+		$cohorts = array();
+
+		/**
+		 * The query must return a unique cohort_id, title and total members
+		 */
+		switch ($this->period) {
+			case self::MONTH:
+				$query = "SELECT EXTRACT(YEAR_MONTH FROM regtime) AS cohort_id,
+					DATE_FORMAT(regtime, '%b %Y') AS title,
+					COUNT(*) AS totals
+					FROM u_users";
+				break;
+			case self::YEAR:
+				$query = "SELECT YEAR(regtime) AS cohort_id,
+					YEAR(regtime) AS title,
+					COUNT(*) AS totals
+					FROM u_users";
+				break;
+			case self::WEEK:
+				$query = "SELECT YEARWEEK(regtime) AS cohort_id,
+					CONCAT(
+						DATE_FORMAT(
+							DATE(DATE_SUB(regtime, INTERVAL WEEKDAY(regtime) DAY)),
+							'%b %e, %Y'
+						), ' - ',
+						DATE_FORMAT(
+							DATE(DATE_ADD(regtime, INTERVAL 6-WEEKDAY(regtime) DAY)),
+							'%b %e, %Y'
+						)
+					) AS title,
+					COUNT(*) AS totals
+					FROM u_users";
+				break;
+			default:
+				throw new \StartupAPI\Exceptions\StartupAPIException('Wrong generation period');
+		}
+
+		// Excluding site administrators
+		if (count(\StartupAPI\UserConfig::$admins) > 0) {
+			$query .= "\nWHERE id NOT IN (" . implode(", ", \StartupAPI\UserConfig::$admins) . ")";
+		}
+
+		$query .= ' GROUP BY cohort_id ORDER BY regtime DESC';
+
+		if ($stmt = $db->prepare($query))
+		{
+			if (!$stmt->execute())
+			{
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
+			}
+			if (!$stmt->bind_result($cohort_id, $title, $total))
+			{
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
+			}
+
+			while($stmt->fetch() === TRUE)
+			{
+				$cohorts[] = new Cohort($cohort_id, $title, $total);
+			}
+			$stmt->close();
+		}
+		else
+		{
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
+		}
+
+		return $cohorts;
+	}
+
+	/**
+	 * SQL statement for separation of users into generations
+	 *
+	 * @return string SQL statement for generating a resultset with id, regtime and cohort_id
+	 *
+	 * @throws \StartupAPI\Exceptions\StartupAPIException
+	 */
+	public function getCohortSQL() {
+		switch ($this->period) {
+			case self::MONTH:
+				$query = 'SELECT id, regtime, EXTRACT(YEAR_MONTH FROM regtime) AS cohort_id
+					FROM u_users';
+				break;
+			case self::YEAR:
+				$query = 'SELECT id, regtime, YEAR(regtime) AS cohort_id
+					FROM u_users';
+				break;
+			case self::WEEK:
+				$query = 'SELECT id, regtime, YEARWEEK(regtime) AS cohort_id
+					FROM u_users';
+				break;
+			default:
+				throw new \StartupAPI\Exceptions\StartupAPIException('Wrong generation period');
+		}
+
+		return $query;
+	}
+}
diff --git a/classes/CohortAnalysis/RegMethodCohorts.php b/classes/CohortAnalysis/RegMethodCohorts.php
new file mode 100644
index 0000000..ffad2bf
--- /dev/null
+++ b/classes/CohortAnalysis/RegMethodCohorts.php
@@ -0,0 +1,94 @@
+<?php
+namespace StartupAPI\CohortAnalysis;
+
+/**
+ * This class allows dropping users into cohorts by registration method / module
+ *
+ * @package StartupAPI
+ * @subpackage Analytics\CohortAnalysis
+ */
+class RegMethodCohorts extends CohortProvider {
+	/**
+	 * Creates new cohort provider based on user's method of registration (Authentication Module)
+	 */
+	public function __construct() {
+		parent::__construct('byregmethod', 'Users registration method');
+	}
+
+	/**
+	 * Always returns "Reg. module"
+	 *
+	 * @return string "Reg. module"
+	 */
+	public function getDimensionTitle() {
+		return 'Reg. module';
+	}
+
+	/**
+	 * Returns a list of registration module cohorts for all modules users actually regusterd with
+	 *
+	 * @return array $cohorts An array of Cohort objects
+	 *
+	 * @throws Exceptions\DBException
+	 */
+	public function getCohorts() {
+		$db = UserConfig::getDB();
+
+		$cohort_titles = array();
+
+		foreach (UserConfig::$authentication_modules as $module) {
+			$cohort_titles[$module->getID()] = $module->getTitle();
+		}
+
+		/**
+		 * The query must return a unique cohort_id, title and total members
+		 */
+		$query = 'SELECT regmodule AS cohort_id, COUNT(*) AS totals FROM u_users';
+
+		$siteadminsstring = null;
+		if (count(UserConfig::$admins) > 0) {
+			$siteadminsstring = implode(", ", UserConfig::$admins);
+		}
+
+		if (!is_null($siteadminsstring)) {
+			$query .= "\nWHERE id NOT IN ($siteadminsstring)";
+		}
+
+		$cohorts = array();
+
+		$query .= ' GROUP BY cohort_id ORDER BY regtime DESC';
+
+		if ($stmt = $db->prepare($query))
+		{
+			if (!$stmt->execute())
+			{
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
+			}
+			if (!$stmt->bind_result($cohort_id, $total))
+			{
+				throw new Exceptions\DBBindResultException($db, $stmt);
+			}
+
+			while($stmt->fetch() === TRUE)
+			{
+				$cohorts[] = new Cohort($cohort_id, $cohort_titles[$cohort_id], $total);
+			}
+			$stmt->close();
+		}
+		else
+		{
+			throw new Exceptions\DBPrepareStmtException($db);
+		}
+
+		return $cohorts;
+	}
+
+	/**
+	 * SQL statement for separation of users into buckets by registration module
+	 *
+	 * @return string SQL statement for generating a resultset with id, regtime and cohort_id
+	 */
+	public function getCohortSQL() {
+		return 'SELECT id, regtime, regmodule AS cohort_id FROM u_users';
+	}
+}
diff --git a/classes/EmailModule.php b/classes/EmailModule.php
index 59869d5..e7fe431 100644
--- a/classes/EmailModule.php
+++ b/classes/EmailModule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Abstract class for newsletter management modules to subclass
  *
@@ -17,7 +19,7 @@ public function __construct() {
 		parent::__construct();
 
 		if (!is_null(UserConfig::$email_module)) {
-			throw new EmailModuleException("You can assign only one email module");
+			throw new Exceptions\Email\EmailModuleException("You can assign only one email module");
 		}
 
 		UserConfig::$email_module = $this;
@@ -80,41 +82,9 @@ public function userChanged($old_user, $new_user) {
 					// update subscriber info
 					UserConfig::$email_module->updateSubscriber($old_user, $new_user);
 				}
-			} catch (EmailModuleException $e) {
+			} catch (Exceptions\Email\EmailModuleException $e) {
 				error_log($e."\n[User Info]: ".var_export($new_user, true));
 			}
 		}
 	}
 }
-
-/**
- * Generic Email Module Exception
- *
- * @package StartupAPI
- * @subpackage Email
- */
-class EmailModuleException extends Exception {}
-
-/**
- * Exception thrown when there are subscription problems
- *
- * @package StartupAPI
- * @subpackage Email
- */
-class EmailSubscriptionException extends EmailModuleException { }
-
-/**
- * Exception thrown when there are problem with updating subscriber information
- *
- * @package StartupAPI
- * @subpackage Email
- */
-class EmailSubscriberUpdateException extends EmailModuleException { }
-
-/**
- * Exception thrown when there are problems with unsubscribing a user
- *
- * @package StartupAPI
- * @subpackage Email
- */
-class EmailUnSubscriptionException extends EmailModuleException { }
diff --git a/classes/Exceptions/Authentication/AuthenticationException.php b/classes/Exceptions/Authentication/AuthenticationException.php
new file mode 100644
index 0000000..5a623d9
--- /dev/null
+++ b/classes/Exceptions/Authentication/AuthenticationException.php
@@ -0,0 +1,57 @@
+<?php
+namespace StartupAPI\Exceptions\Authentication;
+
+/**
+ * Abstract authentication exception class for specific exceptions to subclass
+ *
+ * Comparing to regular exception, this one also stores a list of messages to be passed back to forms being rendered
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+abstract class AuthenticationException extends \StartupAPI\Exceptions\StartupAPIException {
+
+	/**
+	 * An associative array of error messages
+	 *
+	 * Each form is free to define it's own keys, usually to indicate
+	 * part of the form where error messages will be displayed.
+	 *
+	 * Values can also be linear arrays to allow for display of
+	 * multiple messages in the same location.
+	 *
+	 * @var array
+	 */
+	protected $errors;
+
+	/**
+	 * Creates an exception accepting the list of error messages as 3rd parameter
+	 *
+	 * Example:
+	 * <code>
+	 * $errors['email'][] = "Using example domain";
+	 * $errors['email'][] = "Verification email doesn't match";
+	 * throw new Exceptions\Authentication\InputValidationException('Email validation failed', 0, $errors);
+	 * </code>
+	 *
+	 * @see InputValidationException
+	 *
+	 * @param string $string Exception message
+	 * @param int $code Excepton code
+	 * @param array $errors A list of error messages to be displayed to the user
+	 */
+	public function __construct($string, $code, $errors) {
+		parent::__construct($string, $code);
+		$this->errors = $errors;
+	}
+
+	/**
+	 * Returns a list of error messages to display
+	 *
+	 * @return array an array of error messages
+	 */
+	public function getErrors() {
+		return $this->errors;
+	}
+
+}
diff --git a/classes/Exceptions/Authentication/ExistingUserException.php b/classes/Exceptions/Authentication/ExistingUserException.php
new file mode 100644
index 0000000..c1ae193
--- /dev/null
+++ b/classes/Exceptions/Authentication/ExistingUserException.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Exceptions\Authentication;
+
+/**
+ * Exception thrown when newly registered user already exists
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+class ExistingUserException extends AuthenticationException {
+
+}
diff --git a/classes/Exceptions/Authentication/InputValidationException.php b/classes/Exceptions/Authentication/InputValidationException.php
new file mode 100644
index 0000000..c7bdad6
--- /dev/null
+++ b/classes/Exceptions/Authentication/InputValidationException.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Exceptions\Authentication;
+
+/**
+ * Exception thrown when form fields didn't pass validation
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+class InputValidationException extends AuthenticationException {
+
+}
diff --git a/classes/Exceptions/Authentication/UserCreationException.php b/classes/Exceptions/Authentication/UserCreationException.php
new file mode 100644
index 0000000..57447e7
--- /dev/null
+++ b/classes/Exceptions/Authentication/UserCreationException.php
@@ -0,0 +1,14 @@
+<?php
+namespace StartupAPI\Exceptions\Authentication;
+
+/**
+ * Exception thrown when user account couldn't be created
+ *
+ * @todo Check if this is actually used or there is a valid use case for it.
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+class UserCreationException extends AuthenticationException {
+
+}
diff --git a/classes/Exceptions/DBBindParamException.php b/classes/Exceptions/DBBindParamException.php
new file mode 100644
index 0000000..96c1c80
--- /dev/null
+++ b/classes/Exceptions/DBBindParamException.php
@@ -0,0 +1,11 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Paremeter Binding Exception
+ *
+ * @package StartupAPI
+ */
+class DBBindParamException extends DBException {
+
+}
diff --git a/classes/Exceptions/DBBindResultException.php b/classes/Exceptions/DBBindResultException.php
new file mode 100644
index 0000000..775fe00
--- /dev/null
+++ b/classes/Exceptions/DBBindResultException.php
@@ -0,0 +1,11 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Result binding Exception
+ *
+ * @package StartupAPI
+ */
+class DBBindResultException extends DBException {
+
+}
diff --git a/classes/Exceptions/DBException.php b/classes/Exceptions/DBException.php
new file mode 100644
index 0000000..f17453e
--- /dev/null
+++ b/classes/Exceptions/DBException.php
@@ -0,0 +1,47 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Exception for database-related problems
+ *
+ * @package StartupAPI
+ */
+class DBException extends StartupAPIException {
+
+	/**
+	 * Creates a database-related exception
+	 *
+	 * @param mysqli $db MySQLi database object
+	 * @param mysqli_stmt $stmt MySQLi database statement
+	 * @param string $message Exception message
+	 * @param int $code Exception code
+	 * @param Exception $previous Previous exception in the chain
+	 */
+	function __construct(mysqli $db = null, $stmt = null, $message = null, $code = null, $previous = null) {
+		$exception_message = $message;
+
+		$class = get_class($this);
+		$file = self::getFile();
+		$line = self::getLine();
+
+		if (is_null($db)) {
+			$exception_message = "[$class] Can't connect to database, \$db object is null (in $file on line $line)";
+		} else if ($db->connect_error) {
+			$exception_message = "[$class] Can't connect to database: (" . $db->connect_errno . ") " .
+					$db->connect_error . " (in $file on line $line)";
+		} else if ($db->error) {
+			$exception_message = "[$class] DB Error: " . $db->error . " (in $file on line $line)";
+		} else if (!$stmt) {
+			$exception_message = "[$class]" .
+					' $db->error: ' . $db->error .
+					' with message: ' . $message . " (in $file on line $line)";
+		} else {
+			$exception_message = "[$class]" .
+					' $stmt->error: ' . $stmt->error .
+					' with message: ' . $message . " (in $file on line $line)";
+		}
+
+		parent::__construct($exception_message, $code, $previous);
+	}
+
+}
diff --git a/classes/Exceptions/DBExecuteStmtException.php b/classes/Exceptions/DBExecuteStmtException.php
new file mode 100644
index 0000000..870ac90
--- /dev/null
+++ b/classes/Exceptions/DBExecuteStmtException.php
@@ -0,0 +1,11 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Statement Execution Exception
+ *
+ * @package StartupAPI
+ */
+class DBExecuteStmtException extends DBException {
+
+}
diff --git a/classes/Exceptions/DBPrepareStmtException.php b/classes/Exceptions/DBPrepareStmtException.php
new file mode 100644
index 0000000..898b901
--- /dev/null
+++ b/classes/Exceptions/DBPrepareStmtException.php
@@ -0,0 +1,11 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Statement preparation Exception
+ *
+ * @package StartupAPI
+ */
+class DBPrepareStmtException extends DBException {
+
+}
diff --git a/classes/Exceptions/Email/EmailModuleException.php b/classes/Exceptions/Email/EmailModuleException.php
new file mode 100644
index 0000000..55a4dd1
--- /dev/null
+++ b/classes/Exceptions/Email/EmailModuleException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\Exceptions\Email;
+
+/**
+ * Generic Email Module Exception
+ *
+ * @package StartupAPI
+ * @subpackage Email
+ */
+class EmailModuleException extends \StartupAPI\Exceptions\StartupAPIException {}
diff --git a/classes/Exceptions/Email/EmailSubscriberUpdateException.php b/classes/Exceptions/Email/EmailSubscriberUpdateException.php
new file mode 100644
index 0000000..f9aa5f0
--- /dev/null
+++ b/classes/Exceptions/Email/EmailSubscriberUpdateException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\Exceptions\Email;
+
+/**
+ * Exception thrown when there are problem with updating subscriber information
+ *
+ * @package StartupAPI
+ * @subpackage Email
+ */
+class EmailSubscriberUpdateException extends EmailModuleException { }
diff --git a/classes/Exceptions/Email/EmailSubscriptionException.php b/classes/Exceptions/Email/EmailSubscriptionException.php
new file mode 100644
index 0000000..2f0828e
--- /dev/null
+++ b/classes/Exceptions/Email/EmailSubscriptionException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\Exceptions\Email;
+
+/**
+ * Exception thrown when there are subscription problems
+ *
+ * @package StartupAPI
+ * @subpackage Email
+ */
+class EmailSubscriptionException extends EmailModuleException { }
diff --git a/classes/Exceptions/Email/EmailUnSubscriptionException.php b/classes/Exceptions/Email/EmailUnSubscriptionException.php
new file mode 100644
index 0000000..a040685
--- /dev/null
+++ b/classes/Exceptions/Email/EmailUnSubscriptionException.php
@@ -0,0 +1,10 @@
+<?php
+namespace StartupAPI\Exceptions\Email;
+
+/**
+ * Exception thrown when there are problems with unsubscribing a user
+ *
+ * @package StartupAPI
+ * @subpackage Email
+ */
+class EmailUnSubscriptionException extends EmailModuleException { }
diff --git a/classes/Exceptions/OAuth2Exception.php b/classes/Exceptions/OAuth2Exception.php
new file mode 100644
index 0000000..772cfc5
--- /dev/null
+++ b/classes/Exceptions/OAuth2Exception.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Represents exceptions related to OAuth2 flows
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\OAuth2
+ */
+class OAuth2Exception extends StartupAPIException {
+
+}
diff --git a/classes/Exceptions/StartupAPIDeprecatedException.php b/classes/Exceptions/StartupAPIDeprecatedException.php
new file mode 100644
index 0000000..de38d72
--- /dev/null
+++ b/classes/Exceptions/StartupAPIDeprecatedException.php
@@ -0,0 +1,14 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Exception thrown when deprecated method is called
+ *
+ * Replace deprecated code with this exception to make sure instances that use
+ * deprecated functionality have last warning to remove it.
+ *
+ * @package StartupAPI
+ */
+class StartupAPIDeprecatedException extends StartupAPIException {
+
+}
diff --git a/classes/Exceptions/StartupAPIException.php b/classes/Exceptions/StartupAPIException.php
new file mode 100644
index 0000000..c31f073
--- /dev/null
+++ b/classes/Exceptions/StartupAPIException.php
@@ -0,0 +1,22 @@
+<?php
+namespace StartupAPI\Exceptions;
+
+/**
+ * Exception superclass used for all exceptions in StartupAPI
+ *
+ * @package StartupAPI
+ */
+class StartupAPIException extends \Exception {
+
+	/**
+	 * General Startup API Exception
+	 *
+	 * @param string $message Exception message
+	 * @param int $code Exception code
+	 * @param Exception $previous Previous exception in the chain
+	 */
+	function __construct($message, $code = null, $previous = null) {
+		parent::__construct('[StartupAPI] ' . $message, $code, $previous);
+	}
+
+}
diff --git a/classes/Feature.php b/classes/Feature.php
index 9cd17f7..45c5233 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Represents application feature
  *
@@ -176,7 +178,6 @@ public static function getByID($id) {
 		return null;
 	}
 
-	//
 	/**
 	 * Initializes features based on old configuration
 	 *
@@ -186,7 +187,7 @@ public static function getByID($id) {
 	 */
 	public static function init() {
 		foreach (UserConfig::$features as $id => $details) {
-			new Feature($id, $details[0], $details[1], $details[2]);
+			new self($id, $details[0], $details[1], $details[2]);
 		}
 	}
 
@@ -208,7 +209,7 @@ public function isEnabledForPlan(Plan $plan) {
 	 *
 	 * @return boolean Enabled / Disabled
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function isEnabledForAccount(Account $account, $ignore_propagation = false) {
 		if (!$ignore_propagation) {
@@ -235,13 +236,13 @@ public function isEnabledForAccount(Account $account, $ignore_propagation = fals
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_account_features WHERE account_id = ? AND feature_id = ?')) {
 			if (!$stmt->bind_param('ii', $account_id, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($enabled)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -249,7 +250,7 @@ public function isEnabledForAccount(Account $account, $ignore_propagation = fals
 
 			return $enabled > 0;
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -258,7 +259,7 @@ public function isEnabledForAccount(Account $account, $ignore_propagation = fals
 	 *
 	 * @param Account $account Account to enable this feature for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function enableForAccount(Account $account) {
 		$db = UserConfig::getDB();
@@ -267,15 +268,15 @@ public function enableForAccount(Account $account) {
 
 		if ($stmt = $db->prepare('REPLACE INTO u_account_features (account_id, feature_id) VALUES (?, ?)')) {
 			if (!$stmt->bind_param('ii', $account_id, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -284,7 +285,7 @@ public function enableForAccount(Account $account) {
 	 *
 	 * @param Account $account Account to remove this feature for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function removeForAccount(Account $account) {
 		$db = UserConfig::getDB();
@@ -293,14 +294,14 @@ public function removeForAccount(Account $account) {
 
 		if ($stmt = $db->prepare('DELETE FROM u_account_features WHERE account_id = ? AND feature_id = ?')) {
 			if (!$stmt->bind_param('ii', $account_id, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -313,7 +314,7 @@ public function removeForAccount(Account $account) {
 	 *
 	 * @return boolean Enabled / Disabled
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function isEnabledForUser(User $user, $ignore_propagation = false) {
 		if (!$ignore_propagation) {
@@ -339,13 +340,13 @@ public function isEnabledForUser(User $user, $ignore_propagation = false) {
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_user_features WHERE user_id = ? AND feature_id = ?')) {
 			if (!$stmt->bind_param('ii', $user_id, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($enabled)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -353,7 +354,7 @@ public function isEnabledForUser(User $user, $ignore_propagation = false) {
 
 			return $enabled > 0 ? true : false;
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return false;
@@ -364,20 +365,20 @@ public function isEnabledForUser(User $user, $ignore_propagation = false) {
 	 *
 	 * @return int Number of users this feature is enabled for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCount() {
 		$db = UserConfig::getDB();
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_user_features WHERE feature_id = ?')) {
 			if (!$stmt->bind_param('i', $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($rolledout)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -385,7 +386,7 @@ public function getUserCount() {
 
 			return $rolledout;
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return false;
@@ -396,20 +397,20 @@ public function getUserCount() {
 	 *
 	 * @return int Number of accounts this feature is enabled for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getAccountCount() {
 		$db = UserConfig::getDB();
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_account_features WHERE feature_id = ?')) {
 			if (!$stmt->bind_param('i', $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($rolledout)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -417,7 +418,7 @@ public function getAccountCount() {
 
 			return $rolledout;
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return false;
@@ -428,7 +429,7 @@ public function getAccountCount() {
 	 *
 	 * @param User $user User to remove this feature for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function removeForUser(User $user) {
 		// now, let's see if user has it enabled
@@ -438,14 +439,14 @@ public function removeForUser(User $user) {
 
 		if ($stmt = $db->prepare('DELETE FROM u_user_features WHERE user_id = ? AND feature_id = ?')) {
 			if (!$stmt->bind_param('ii', $userid, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -454,7 +455,7 @@ public function removeForUser(User $user) {
 	 *
 	 * @param User $user User to enables this feature for
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function enableForUser(User $user) {
 		// now, let's see if user has it enabled
@@ -464,15 +465,15 @@ public function enableForUser(User $user) {
 
 		if ($stmt = $db->prepare('REPLACE INTO u_user_features (user_id, feature_id) VALUES (?, ?)')) {
 			if (!$stmt->bind_param('ii', $userid, $this->id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 }
diff --git a/classes/Invitation.php b/classes/Invitation.php
index 7a60d9e..db156e0 100644
--- a/classes/Invitation.php
+++ b/classes/Invitation.php
@@ -1,7 +1,5 @@
 <?php
-
-require_once(dirname(__DIR__) . '/global.php');
-require_once(dirname(__DIR__) . '/classes/User.php');
+namespace StartupAPI;
 
 /**
  * Invitation class
@@ -95,7 +93,7 @@ private function __construct($code, $time_created, $issuedby, $is_admin_invite =
 	 *
 	 * @return array Array of Invitation objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUnsent() {
 		$invitations = array();
@@ -106,10 +104,10 @@ public static function getUnsent() {
 			FROM u_invitation
 			WHERE is_admin_invite = 1 AND sent_to_note IS NULL AND user_id IS NULL')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($code, $time_created, $issuedby)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -118,7 +116,7 @@ public static function getUnsent() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $invitations;
@@ -132,7 +130,7 @@ public static function getUnsent() {
 	 *
 	 * @return array Array of Invitation objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getSent($admin = null, User $issuer = null) {
 		$invitations = array();
@@ -155,10 +153,10 @@ public static function getSent($admin = null, User $issuer = null) {
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($code, $time_created, $issuedby, $is_admin_invite, $sent_to_email, $sent_to_name, $sent_to_note, $user_id, $account_id, $plan_slug)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -168,7 +166,7 @@ public static function getSent($admin = null, User $issuer = null) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $invitations;
@@ -186,22 +184,22 @@ public function cancel() {
 	 *
 	 * @param string $code Invitation code to cancel
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function cancelByCode($code) {
 		$db = UserConfig::getDB();
 
 		if ($stmt = $db->prepare('DELETE FROM u_invitation WHERE code = ?')) {
 			if (!$stmt->bind_param('s', $code)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -213,7 +211,7 @@ public static function cancelByCode($code) {
 	 *
 	 * @return array Array of Invitation objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getAccepted($admin = null, User $issuer = null) {
 		$invitations = array();
@@ -239,10 +237,10 @@ public static function getAccepted($admin = null, User $issuer = null) {
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($code, $time_created, $issuedby, $is_admin_invite, $sent_to_email, $sent_to_name, $sent_to_note, $user_id, $account_id, $plan_slug)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -252,7 +250,7 @@ public static function getAccepted($admin = null, User $issuer = null) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $invitations;
@@ -265,7 +263,7 @@ public static function getAccepted($admin = null, User $issuer = null) {
 	 *
 	 * @return Invitation
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getByCode($code) {
 		$invitation = null;
@@ -277,13 +275,13 @@ public static function getByCode($code) {
 			FROM u_invitation
 			WHERE code = ?')) {
 			if (!$stmt->bind_param('s', $code)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($code, $time_created, $issuedby, $is_admin_invite, $sent_to_email, $sent_to_name, $sent_to_note, $user_id, $account_id, $plan_slug)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -293,7 +291,7 @@ public static function getByCode($code) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $invitation;
@@ -306,7 +304,7 @@ public static function getByCode($code) {
 	 *
 	 * @return Invitation
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUserInvitation(User $user) {
 		$invitation = null;
@@ -319,13 +317,13 @@ public static function getUserInvitation(User $user) {
 			FROM u_invitation
 			WHERE user_id = ?')) {
 			if (!$stmt->bind_param('i', $user_id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($code, $time_created, $issuedby, $is_admin_invite, $sent_to_email, $sent_to_name, $sent_to_note, $user_id, $account_id, $plan_slug)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -335,7 +333,7 @@ public static function getUserInvitation(User $user) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $invitation;
@@ -346,7 +344,7 @@ public static function getUserInvitation(User $user) {
 	 *
 	 * @param int $howmany How many codes to generate
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function generateAdminInvites($howmany = 1) {
 		$db = UserConfig::getDB();
@@ -356,16 +354,16 @@ public static function generateAdminInvites($howmany = 1) {
 				$code = self::generateCode();
 
 				if (!$stmt->bind_param('s', $code)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -383,15 +381,15 @@ public static function createInvite($from_admin = false) {
 			$from_admin_int = $from_admin ? 1 : 0;
 
 			if (!$stmt->bind_param('si', $code, $from_admin_int)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return self::getByCode($code);
@@ -428,7 +426,7 @@ public function send() {
 		$message_body = call_user_func_array(UserConfig::$onRenderInvitationEmailMessage, array($this));
 		$subject = call_user_func_array(UserConfig::$onRenderInvitationEmailSubject, array($this));
 
-		$message = Swift_Message::newInstance($subject, $message_body);
+		$message = \Swift_Message::newInstance($subject, $message_body);
 		$message->setFrom(array(UserConfig::$supportEmailFromEmail => UserConfig::$supportEmailFromName));
 		$message->setTo(array($email => $name));
 		$message->setReplyTo(array(UserConfig::$supportEmailReplyTo));
@@ -584,7 +582,7 @@ public function setPlan(Plan $plan) {
 	/**
 	 * Persists invitation object in database
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function save() {
 		$db = UserConfig::getDB();
@@ -604,15 +602,15 @@ public function save() {
 				plan_slug = ?
 			WHERE code = ?')) {
 			if (!$stmt->bind_param('sssiiiiss', $email, $name, $note, $this->issuedby, $this->is_admin_invite, $this->user_id, $this->account_id, $this->plan_slug, $this->code)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
diff --git a/classes/ModelledClock.php b/classes/ModelledClock.php
new file mode 100644
index 0000000..111ab6b
--- /dev/null
+++ b/classes/ModelledClock.php
@@ -0,0 +1,23 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * @package StartupAPI
+ */
+class ModelledClock extends Clock {
+  private $datetime;
+
+  function __construct() {
+    $this -> datetime = new DateTime( '00010101T000000' );
+  }
+
+  function _getDateTime()
+  {
+    return $this -> datetime;
+  }
+
+  function _addTime( $date_interval )
+  {
+    $this -> datetime -> add( new DateInterval ( $date_interval ));
+  }
+}
diff --git a/classes/CookieStorage.php b/classes/MrClay_CookieStorage.php
similarity index 95%
rename from classes/CookieStorage.php
rename to classes/MrClay_CookieStorage.php
index ea34933..1c02ad4 100644
--- a/classes/CookieStorage.php
+++ b/classes/MrClay_CookieStorage.php
@@ -1,9 +1,12 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Store tamper-proof strings in an HTTP cookie
  *
- * Source: http://code.google.com/p/mrclay/source/browse/trunk/php/MrClay/CookieStorage.php
+ * @package StartupAPI
  *
+ * Source: https://github.com/mrclay/old-misc/blob/master/php/MrClay/CookieStorage.php
  * <code>
  * $storage = new MrClay_CookieStorage(array(
  *     'secret' => '67676kmcuiekihbfyhbtfitfytrdo=op-p-=[hH8'
@@ -92,9 +95,9 @@ public function getDefaults()
             ,'secure' => false
             ,'path' => '/'
             ,'expire' => '2147368447' // Sun, 17-Jan-2038 19:14:07 GMT (Google)
-            ,'hashFunc' => array('MrClay_CookieStorage', 'hash')
-            ,'encryptFunc' => array('MrClay_CookieStorage', 'encrypt')
-            ,'decryptFunc' => array('MrClay_CookieStorage', 'decrypt')
+            ,'hashFunc' => array('\StartupAPI\MrClay_CookieStorage', 'hash')
+            ,'encryptFunc' => array('\StartupAPI\MrClay_CookieStorage', 'encrypt')
+            ,'decryptFunc' => array('\StartupAPI\MrClay_CookieStorage', 'decrypt')
             ,'mode' => self::MODE_VISIBLE
 	    ,'httponly' => false
         );
diff --git a/classes/OAuth2Module.php b/classes/OAuth2AuthenticationModule.php
similarity index 84%
rename from classes/OAuth2Module.php
rename to classes/OAuth2AuthenticationModule.php
index 16365b1..510164a 100644
--- a/classes/OAuth2Module.php
+++ b/classes/OAuth2AuthenticationModule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Abstract class, implements OAuth2 flow and data storage for specific modules to subclass
  *
@@ -197,7 +199,7 @@ abstract public function getIdentity($oauth2_client_id);
 	/**
 	 * Starts OAuth2 flow
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	protected function startOAuth2Flow() {
 		try
@@ -223,7 +225,7 @@ protected function startOAuth2Flow() {
 			//  redirect to the authorization page, they will redirect back
 			header('Location: ' . $login_link);
 			exit;
-		} catch(OAuthException2 $e) {
+		} catch(Exceptions\OAuth2Exception $e) {
 			error_log(var_export($e, true));
 		}
 	}
@@ -234,7 +236,7 @@ protected function startOAuth2Flow() {
 	 *
 	 * @return string New/temporary OAuth2 Client ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	protected function getNewOAuth2ClientID() {
 		$db = UserConfig::getDB();
@@ -248,11 +250,11 @@ protected function getNewOAuth2ClientID() {
 		{
 			if (!$stmt->bind_param('s', $module_slug))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$oauth2_client_id = $stmt->insert_id;
 
@@ -260,7 +262,7 @@ protected function getNewOAuth2ClientID() {
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $oauth2_client_id;
@@ -273,7 +275,7 @@ protected function getNewOAuth2ClientID() {
 	 * @param array $identity Identity array provided for this OAuth user
 	 * @param int $oauth2_client_id OAuth2 client id
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function addUserOAuth2Identity($user, $identity, $oauth2_client_id) {
 		$db = UserConfig::getDB();
@@ -293,18 +295,18 @@ public function addUserOAuth2Identity($user, $identity, $oauth2_client_id) {
 		{
 			if (!$stmt->bind_param('ssi', $server_unique_id, $serialized_userinfo, $oauth2_client_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		// Inserting new link between user and their oauth2
@@ -316,18 +318,18 @@ public function addUserOAuth2Identity($user, $identity, $oauth2_client_id) {
 		{
 			if (!$stmt->bind_param('ii', $user_id, $oauth2_client_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -336,7 +338,7 @@ public function addUserOAuth2Identity($user, $identity, $oauth2_client_id) {
 	 *
 	 * @param int $oauth2_client_id OAuth2 user ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function deleteOAuth2Client($oauth2_client_id) {
 		$db = UserConfig::getDB();
@@ -348,18 +350,18 @@ public function deleteOAuth2Client($oauth2_client_id) {
 		{
 			if (!$stmt->bind_param('i', $oauth2_client_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -373,7 +375,7 @@ public function deleteOAuth2Client($oauth2_client_id) {
 	 *
 	 * @return User|null User object or null if these credentials are not connected to any user
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserByOAuth2Identity($identity, $oauth2_client_id) {
 		$db = UserConfig::getDB();
@@ -396,15 +398,15 @@ public function getUserByOAuth2Identity($identity, $oauth2_client_id) {
 		{
 			if (!$stmt->bind_param('ss', $module_slug, $server_unique_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($old_oauth2_client_id, $user_id))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -412,7 +414,7 @@ public function getUserByOAuth2Identity($identity, $oauth2_client_id) {
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		// nobody registered with this identity yet
@@ -469,7 +471,7 @@ public function getOAuth2ClientIDByCode($code) {
 		UserTools::debug("Response: $result");
 
 		if (curl_getinfo($ch, CURLINFO_HTTP_CODE) != 200) {
-			throw new OAuth2Exception("OAuth2 call failed: " . curl_error($ch) . ' (Code: ' . curl_getinfo($ch, CURLINFO_HTTP_CODE) . ')');
+			throw new Exceptions\OAuth2Exception("OAuth2 call failed: " . curl_error($ch) . ' (Code: ' . curl_getinfo($ch, CURLINFO_HTTP_CODE) . ')');
 		}
 		curl_close($ch);
 
@@ -478,14 +480,14 @@ public function getOAuth2ClientIDByCode($code) {
 		$access_token = null;
 		if (array_key_exists('error', $result)) {
 			// looks like we couldn't exchange the code for token
-			throw new OAuth2Exception("OAuth2 error returned");
+			throw new Exceptions\OAuth2Exception("OAuth2 error returned");
 		} else if (array_key_exists('access_token', $result)) {
 			$access_token = $result['access_token'];
 		}
 
 		if (is_null($access_token)) {
 			// hmm. no error, but not token either
-			throw new OAuth2Exception("OAuth2 access token is not returned");
+			throw new Exceptions\OAuth2Exception("OAuth2 access token is not returned");
 		}
 
 		$refresh_token = array_key_exists('refresh_token', $result) ? $result['refresh_token'] : null;
@@ -518,15 +520,15 @@ public function getOAuth2ClientIDByCode($code) {
 		{
 			if (!$stmt->bind_param('ss', $module_slug, $access_token))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($oauth2_client_id, $current_expires, $current_refresh))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -534,7 +536,7 @@ public function getOAuth2ClientIDByCode($code) {
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$oauth2_client_id) {
@@ -551,17 +553,17 @@ public function getOAuth2ClientIDByCode($code) {
 					$access_token_expires,
 					$refresh_token))
 				{
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute())
 				{
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 				$oauth2_client_id = $stmt->insert_id;
 
 				$stmt->close();
 			} else {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 		} else if ($access_token_expires != $current_expires
 				|| $refresh_token != $current_refresh) {
@@ -577,16 +579,16 @@ public function getOAuth2ClientIDByCode($code) {
 					$refresh_token,
 					$oauth2_client_id))
 				{
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute())
 				{
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$stmt->close();
 			} else {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 		}
 
@@ -663,7 +665,7 @@ public function renderRegistrationForm($template_info, $full = false, $action =
 	 *
 	 * @return string Rendered user ediging form for this module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function renderEditUserForm($template_info, $action, $errors, $user, $data)
 	{
@@ -686,15 +688,15 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		{
 			if (!$stmt->bind_param('is', $user_id, $module_slug))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($oauth2_client_id, $serialized_userinfo))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -702,7 +704,7 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$template_info['slug'] = $this->getID();
@@ -731,7 +733,7 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 	 *
 	 * @return OAuth2UserCredentials OAuth2 credentials object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	protected function getOAuth2Credentials($oauth2_client_id)
 	{
@@ -748,15 +750,15 @@ protected function getOAuth2Credentials($oauth2_client_id)
 		{
 			if (!$stmt->bind_param('i', $oauth2_client_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($serialized_userinfo, $access_token, $access_token_expires, $refresh_token))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -764,7 +766,7 @@ protected function getOAuth2Credentials($oauth2_client_id)
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return new OAuth2UserCredentials($this, $oauth2_client_id, unserialize($serialized_userinfo),
@@ -780,7 +782,7 @@ protected function getOAuth2Credentials($oauth2_client_id)
 	 *
 	 * @return OAuth2UserCredentials User credentials object specific to the module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCredentials($user)
 	{
@@ -804,16 +806,16 @@ public function getUserCredentials($user)
 		{
 			if (!$stmt->bind_param('is', $user_id, $module_slug))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($oauth2_client_id, $serialized_userinfo,
 				$access_token, $access_token_expires, $refresh_token))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -821,7 +823,7 @@ public function getUserCredentials($user)
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (is_null($serialized_userinfo)) {
@@ -894,7 +896,7 @@ public function processRegistration($data, &$remember)
 	 * @param array $data Form data
 	 *
 	 * @return boolean True if successful and false if unsuccessful
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function processEditUser($user, $data)
 	{
@@ -955,7 +957,7 @@ public function recordAddActivity($user) {
 	 *
 	 * @return int Number of users connected using the module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getTotalConnectedUsers()
 	{
@@ -975,15 +977,15 @@ public function getTotalConnectedUsers()
 		{
 			if (!$stmt->bind_param('s', $module_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($conns))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -991,7 +993,7 @@ public function getTotalConnectedUsers()
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $conns;
@@ -1062,7 +1064,7 @@ public function makeOAuth2Request($credentials, $url, $method = 'GET', $request_
 		UserTools::debug("Response: $result");
 
 		if (curl_getinfo($ch, CURLINFO_HTTP_CODE) != 200) {
-			throw new OAuth2Exception("OAuth2 call failed: " . curl_error($ch) . ' (Code: ' . curl_getinfo($ch, CURLINFO_HTTP_CODE) . ')');
+			throw new Exceptions\OAuth2Exception("OAuth2 call failed: " . curl_error($ch) . ' (Code: ' . curl_getinfo($ch, CURLINFO_HTTP_CODE) . ')');
 		}
 		curl_close($ch);
 
@@ -1078,96 +1080,3 @@ public function isCompact() {
 		return true;
 	}
 }
-
-/**
- * Class representing user credentials for making OAuth2 API calls
- *
- * Should be extended by subclasses to implement additional features and customize
- * formatting for user information, e.g. add links to user profiles, userpics and so on.
- *
- * @package StartupAPI
- * @subpackage Authentication\OAuth2
- */
-class OAuth2UserCredentials extends UserCredentials {
-	/**
-	 * Module that represents the credentials
-	 */
-	protected $oauth2_module;
-
-	/**
-	 * @var int OAuth2 client id
-	 */
-	protected $oauth2_client_id;
-
-	/**
-	 * @var array User info object specific to a subclass
-	 */
-	protected $userinfo;
-
-	/**
-	 * @var string OAuth2 access token
-	 */
-	protected $access_token;
-
-	/**
-	 * @var int Second since epoch when OAuth2 access token expires
-	 */
-	protected $access_token_expires;
-
-	/**
-	 * @var string Refresh token to be used to get new OAuth access token without re-authorization
-	 */
-	protected $refresh_token;
-
-	/**
-	 * Creates new OAuth2 credentials
-	 *
-	 * @param int $oauth2_client_id OAuth client ID
-	 * @param array $userinfo User info array as retrieved from provider
-	 */
-	public function __construct($oauth2_module, $oauth2_client_id, $userinfo,
-		$access_token, $access_token_expires, $refresh_token)
-	{
-		$this->oauth2_module = $oauth2_module;
-		$this->oauth2_client_id = $oauth2_client_id;
-		$this->userinfo = $userinfo;
-		$this->access_token = $access_token;
-		$this->access_token_expires = $access_token_expires;
-		$this->refresh_token = $refresh_token;
-	}
-
-	/**
-	 * Returns a chunk of HTML to display user's credentials
-	 *
-	 * This method will most likely be implemented by a subclass using $this->userinfo object.
-	 * For some providers it can be returning a code to include a JavaScript widget.
-	 *
-	 * @return string HTML to display user information
-	 */
-	public function getHTML() {
-		return $this->userinfo['name'];
-	}
-
-	/**
-	 * Returns OAuth2 access token
-	 *
-	 * @return string OAuth2 access token
-	 */
-	public function getAccessToken() {
-		return $this->access_token;
-	}
-
-	public function makeOAuth2Request($request, $method = 'GET', $params = null, $curlopt = array()) {
-		return $this->oauth2_module->makeOAuth2Request($this, $request, $method, $params, $curlopt);
-	}
-}
-
-/**
- * Represents exceptions related to OAuth2 flows
- *
- * @package StartupAPI
- * @subpackage Authentication\OAuth2
- */
-class OAuth2Exception extends StartupAPIException {
-
-}
diff --git a/classes/OAuth2UserCredentials.php b/classes/OAuth2UserCredentials.php
new file mode 100644
index 0000000..358fb03
--- /dev/null
+++ b/classes/OAuth2UserCredentials.php
@@ -0,0 +1,85 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * Class representing user credentials for making OAuth2 API calls
+ *
+ * Should be extended by subclasses to implement additional features and customize
+ * formatting for user information, e.g. add links to user profiles, userpics and so on.
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\OAuth2
+ */
+class OAuth2UserCredentials extends UserCredentials {
+	/**
+	 * Module that represents the credentials
+	 */
+	protected $oauth2_module;
+
+	/**
+	 * @var int OAuth2 client id
+	 */
+	protected $oauth2_client_id;
+
+	/**
+	 * @var array User info object specific to a subclass
+	 */
+	protected $userinfo;
+
+	/**
+	 * @var string OAuth2 access token
+	 */
+	protected $access_token;
+
+	/**
+	 * @var int Second since epoch when OAuth2 access token expires
+	 */
+	protected $access_token_expires;
+
+	/**
+	 * @var string Refresh token to be used to get new OAuth access token without re-authorization
+	 */
+	protected $refresh_token;
+
+	/**
+	 * Creates new OAuth2 credentials
+	 *
+	 * @param int $oauth2_client_id OAuth client ID
+	 * @param array $userinfo User info array as retrieved from provider
+	 */
+	public function __construct($oauth2_module, $oauth2_client_id, $userinfo,
+		$access_token, $access_token_expires, $refresh_token)
+	{
+		$this->oauth2_module = $oauth2_module;
+		$this->oauth2_client_id = $oauth2_client_id;
+		$this->userinfo = $userinfo;
+		$this->access_token = $access_token;
+		$this->access_token_expires = $access_token_expires;
+		$this->refresh_token = $refresh_token;
+	}
+
+	/**
+	 * Returns a chunk of HTML to display user's credentials
+	 *
+	 * This method will most likely be implemented by a subclass using $this->userinfo object.
+	 * For some providers it can be returning a code to include a JavaScript widget.
+	 *
+	 * @return string HTML to display user information
+	 */
+	public function getHTML() {
+		return $this->userinfo['name'];
+	}
+
+	/**
+	 * Returns OAuth2 access token
+	 *
+	 * @return string OAuth2 access token
+	 */
+	public function getAccessToken() {
+		return $this->access_token;
+	}
+
+	public function makeOAuth2Request($request, $method = 'GET', $params = null, $curlopt = array()) {
+		return $this->oauth2_module->makeOAuth2Request($this, $request, $method, $params, $curlopt);
+	}
+}
diff --git a/classes/OAuthModule.php b/classes/OAuthAuthenticationModule.php
similarity index 84%
rename from classes/OAuthModule.php
rename to classes/OAuthAuthenticationModule.php
index 952c739..ba6e418 100644
--- a/classes/OAuthModule.php
+++ b/classes/OAuthAuthenticationModule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 include_once(dirname(__DIR__).'/oauth-php/library/OAuthStore.php');
 include_once(dirname(__DIR__).'/oauth-php/library/OAuthRequester.php');
 
@@ -176,7 +178,7 @@ public function __construct($serviceName,
 			UserConfig::$activities[$activities[3][0]] = array($activities[3][1], $activities[3][2]);
 		}
 
-		$this->oAuthStore = OAuthStore::instance('MySQLi', array(
+		$this->oAuthStore = \OAuthStore::instance('MySQLi', array(
 			'conn' => UserConfig::getDB(),
 			'table_prefix' => 'u_'
 		));
@@ -227,7 +229,7 @@ protected function initOAuthServer() {
 	/**
 	 * Starts OAuth flow
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	protected function startOAuthFlow() {
 		// generate new user id since we're logging in and have no idea who the user is
@@ -241,7 +243,7 @@ protected function startOAuthFlow() {
 		));
 
 		if (!$storage->store(UserConfig::$oauth_user_id_key, $oauth_user_id)) {
-			throw new StartupAPIException(implode('; ', $storage->errors));
+			throw new Exceptions\StartupAPIException(implode('; ', $storage->errors));
 		}
 
 		try
@@ -297,7 +299,7 @@ protected function getAuthorizeURL($tokenResultParams) {
 	 *
 	 * @return string New/temporary OAuth user ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	protected function getNewOAuthUserID() {
 		$this->initOAuthServer();
@@ -310,11 +312,11 @@ protected function getNewOAuthUserID() {
 		{
 			if (!$stmt->bind_param('s', $module))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$oauth_user_id = $stmt->insert_id;
 
@@ -322,7 +324,7 @@ protected function getNewOAuthUserID() {
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $oauth_user_id;
@@ -335,7 +337,7 @@ protected function getNewOAuthUserID() {
 	 * @param array $identity Identity array provided for this OAuth user
 	 * @param int $oauth_user_id OAuth user id
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function addUserOAuthIdentity($user, $identity, $oauth_user_id) {
 		$db = UserConfig::getDB();
@@ -352,18 +354,18 @@ public function addUserOAuthIdentity($user, $identity, $oauth_user_id) {
 		{
 			if (!$stmt->bind_param('issis', $user_id, $server_unique_id, $serialized_userinfo, $oauth_user_id, $module))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -372,7 +374,7 @@ public function addUserOAuthIdentity($user, $identity, $oauth_user_id) {
 	 *
 	 * @param int $oauth_user_id OAuth user ID
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function deleteOAuthUser($oauth_user_id) {
 		$db = UserConfig::getDB();
@@ -381,18 +383,18 @@ public function deleteOAuthUser($oauth_user_id) {
 		{
 			if (!$stmt->bind_param('i', $oauth_user_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -406,7 +408,7 @@ public function deleteOAuthUser($oauth_user_id) {
 	 *
 	 * @return User|null User object or null if these credentials are not connected to any user
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserByOAuthIdentity($identity, $oauth_user_id) {
 		$db = UserConfig::getDB();
@@ -422,15 +424,15 @@ public function getUserByOAuthIdentity($identity, $oauth_user_id) {
 		{
 			if (!$stmt->bind_param('ss', $module, $server_unique_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($old_oauth_user_id, $user_id))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -438,7 +440,7 @@ public function getUserByOAuthIdentity($identity, $oauth_user_id) {
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		// nobody registered with this identity yet
@@ -458,18 +460,18 @@ public function getUserByOAuthIdentity($identity, $oauth_user_id) {
 			{
 				if (!$stmt->bind_param('issi', $user_id, $server_unique_id, $serialized_userinfo, $oauth_user_id))
 				{
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute())
 				{
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$stmt->close();
 			}
 			else
 			{
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 		}
 
@@ -567,7 +569,7 @@ public function renderRegistrationForm($template_info, $full = false, $action =
 	 *
 	 * @return string Rendered user ediging form for this module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function renderEditUserForm($template_info, $action, $errors, $user, $data)
 	{
@@ -583,15 +585,15 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		{
 			if (!$stmt->bind_param('is', $user_id, $module))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($oauth_user_id, $serialized_userinfo))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -599,7 +601,7 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$template_info['slug'] = $this->getID();
@@ -625,7 +627,7 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 	 *
 	 * @return OAuthUserCredentials User credentials object specific to the module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCredentials($user)
 	{
@@ -641,15 +643,15 @@ public function getUserCredentials($user)
 		{
 			if (!$stmt->bind_param('is', $user_id, $module))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($oauth_user_id, $serialized_userinfo))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -657,7 +659,7 @@ public function getUserCredentials($user)
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (is_null($serialized_userinfo)) {
@@ -729,7 +731,7 @@ public function processRegistration($data, &$remember)
 	 * @param array $data Form data
 	 *
 	 * @return boolean True if successful and false if unsuccessful
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function processEditUser($user, $data)
 	{
@@ -743,18 +745,18 @@ public function processEditUser($user, $data)
 			{
 				if (!$stmt->bind_param('ii', $oauth_user_id, $user_id))
 				{
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute())
 				{
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$stmt->close();
 			}
 			else
 			{
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 
 			if (!is_null($this->USERBASE_ACTIVITY_OAUTH_MODULE_REMOVED)) {
@@ -807,7 +809,7 @@ public function recordAddActivity($user) {
 	 *
 	 * @return int Number of users connected using the module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getTotalConnectedUsers()
 	{
@@ -821,15 +823,15 @@ public function getTotalConnectedUsers()
 		{
 			if (!$stmt->bind_param('s', $module_id))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($conns))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -837,7 +839,7 @@ public function getTotalConnectedUsers()
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $conns;
@@ -852,84 +854,3 @@ public function isCompact() {
 		return true;
 	}
 }
-
-/**
- * Abstract class representing user credentials for making OAuth API calls
- *
- * Should be extended by subclasses to implement additional features and customize
- * formatting for user information, e.g. add links to user profiles, userpics and so on.
- *
- * @package StartupAPI
- * @subpackage Authentication
- */
-abstract class OAuthUserCredentials extends UserCredentials {
-	/**
-	 * @var int OAuth user id
-	 */
-	protected $oauth_user_id;
-
-	/**
-	 * @var array User info object specific to a subclass
-	 */
-	protected $userinfo;
-
-	/**
-	 * Creates new OAuth credentials
-	 *
-	 * @param int $oauth_user_id OAuth user ID
-	 * @param array $userinfo User info array as retrieved from provider
-	 */
-	public function __construct($oauth_user_id, $userinfo) {
-		$this->oauth_user_id = $oauth_user_id;
-		$this->userinfo = $userinfo;
-	}
-
-	/**
-	 * Returns OAuth user ID
-	 *
-	 * @return string OAuth user ID
-	 */
-	public function getOAuthUserID() {
-		return $this->oauth_user_id;
-	}
-
-	/**
-	 * Returns an array of user information key-value pairs
-	 *
-	 * @return array Array of user-specific information
-	 */
-	public function getUserInfo() {
-		return $this->userinfo;
-	}
-
-	/**
-	 * Returns a chunk of HTML to display user's credentials
-	 *
-	 * This method will most likely be implemented by a subclass using $this->userinfo object.
-	 * For some providers it can be returning a code to include a JavaScript widget.
-	 *
-	 * @return string HTML to display user information
-	 */
-	public function getHTML() {
-		return $this->userinfo['name'];
-	}
-
-	/**
-	 * Makes HTTP request with OAuth authentication
-	 *
-	 * This method allows requesting information on behalf of the user from a 3rd party provider.
-	 * Possibly the most important feature of the whole system.
-	 *
-	 * @param string $request Request URL
-	 * @param string $method HTTP method (e.g. GET, POST, PUT, etc)
-	 * @param array $params Request parameters key->value array
-	 * @param string $body Request body
-	 * @param array $files Array of file names (currently supports 1 max untilmultipart/form-data is supported)
-	 *
-	 * @return array Response data (code=>int, headers=>array(), body=>string)
-	 */
-	public function makeOAuthRequest($request, $method = null, $params = null, $body = null, $files = null) {
-		$request = new OAuthRequester($request, $method, $params, $body, $files);
-		return $request->doRequest($this->oauth_user_id);
-	}
-}
diff --git a/classes/OAuthUserCredentials.php b/classes/OAuthUserCredentials.php
new file mode 100644
index 0000000..458ed7d
--- /dev/null
+++ b/classes/OAuthUserCredentials.php
@@ -0,0 +1,83 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * Abstract class representing user credentials for making OAuth API calls
+ *
+ * Should be extended by subclasses to implement additional features and customize
+ * formatting for user information, e.g. add links to user profiles, userpics and so on.
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+abstract class OAuthUserCredentials extends UserCredentials {
+	/**
+	 * @var int OAuth user id
+	 */
+	protected $oauth_user_id;
+
+	/**
+	 * @var array User info object specific to a subclass
+	 */
+	protected $userinfo;
+
+	/**
+	 * Creates new OAuth credentials
+	 *
+	 * @param int $oauth_user_id OAuth user ID
+	 * @param array $userinfo User info array as retrieved from provider
+	 */
+	public function __construct($oauth_user_id, $userinfo) {
+		$this->oauth_user_id = $oauth_user_id;
+		$this->userinfo = $userinfo;
+	}
+
+	/**
+	 * Returns OAuth user ID
+	 *
+	 * @return string OAuth user ID
+	 */
+	public function getOAuthUserID() {
+		return $this->oauth_user_id;
+	}
+
+	/**
+	 * Returns an array of user information key-value pairs
+	 *
+	 * @return array Array of user-specific information
+	 */
+	public function getUserInfo() {
+		return $this->userinfo;
+	}
+
+	/**
+	 * Returns a chunk of HTML to display user's credentials
+	 *
+	 * This method will most likely be implemented by a subclass using $this->userinfo object.
+	 * For some providers it can be returning a code to include a JavaScript widget.
+	 *
+	 * @return string HTML to display user information
+	 */
+	public function getHTML() {
+		return $this->userinfo['name'];
+	}
+
+	/**
+	 * Makes HTTP request with OAuth authentication
+	 *
+	 * This method allows requesting information on behalf of the user from a 3rd party provider.
+	 * Possibly the most important feature of the whole system.
+	 *
+	 * @param string $request Request URL
+	 * @param string $method HTTP method (e.g. GET, POST, PUT, etc)
+	 * @param array $params Request parameters key->value array
+	 * @param string $body Request body
+	 * @param array $files Array of file names (currently supports 1 max untilmultipart/form-data is supported)
+	 *
+	 * @return array Response data (code=>int, headers=>array(), body=>string)
+	 */
+	public function makeOAuthRequest($request, $method = null, $params = null, $body = null, $files = null) {
+		$request = new OAuthRequester($request, $method, $params, $body, $files);
+		return $request->doRequest($this->oauth_user_id);
+	}
+}
diff --git a/classes/PaymentEngine.php b/classes/PaymentEngine.php
index e72abf3..cace9a2 100644
--- a/classes/PaymentEngine.php
+++ b/classes/PaymentEngine.php
@@ -1,15 +1,12 @@
 <?php
+namespace StartupAPI;
 
 /**
+ * Abstract class representing payment engines users can use to pay for subscription
+ *
  * @package StartupAPI
  * @subpackage Subscriptions
  */
-require_once(__DIR__ . '/Account.php');
-require_once(__DIR__ . '/StartupAPIModule.php');
-
-/**
- * Abstract class representing payment engines users can use to pay for subscription
- */
 abstract class PaymentEngine extends StartupAPIModule {
 
 	/**
@@ -223,7 +220,7 @@ public function getID() {
 	/**
 	 * This method is called daily to initiate payments and update accounts
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function cronHandler() {
 		$db = UserConfig::getDB();
@@ -232,23 +229,23 @@ public function cronHandler() {
 		// Those accounts should have negative balance, so we can restrict 'where' condition
 
 		if (!($stmt = $db->prepare('SELECT a.id, UNIX_TIMESTAMP(MIN(ac.date_time)) FROM u_accounts a INNER JOIN u_account_charge ac ON a.id = ac.account_id AND ac.amount > 0 AND engine_slug = ? GROUP BY a.id'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('s', $this->slug)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($account_id, $date_time)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -273,23 +270,23 @@ public function cronHandler() {
 		if (!($stmt = $db->prepare('SELECT id, plan_slug, next_plan_slug, schedule_slug, next_schedule_slug, next_engine_slug ' .
 				'FROM u_accounts ' .
 				'WHERE engine_slug = ? AND active = 1 AND next_charge < ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('ss', $this->slug, date('Y-m-d H:i:s'))) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->store_result()) {
-			throw new DBException($db, $stmt, "Can't store result");
+			throw new Exceptions\DBException($db, $stmt, "Can't store result");
 		}
 
 		if (!$stmt->bind_result($account_id, $plan_slug, $next_plan_slug, $schedule_slug, $next_schedule_slug, $next_engine_slug)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		while ($stmt->fetch() === TRUE) {
@@ -333,15 +330,15 @@ public function cronHandler() {
 
 					// Set new next_charge
 					if (!($stmt2 = $db->prepare('UPDATE u_accounts SET next_charge = next_charge + INTERVAL ? DAY WHERE id = ?'))) {
-						throw new DBPrepareStmtException($db);
+						throw new Exceptions\DBPrepareStmtException($db);
 					}
 
 					if (!$stmt2->bind_param('ii', $schedule->getChargePeriod(), $account->getID())) {
-						throw new DBBindParamException($db, $stmt);
+						throw new Exceptions\DBBindParamException($db, $stmt);
 					}
 
 					if (!$stmt2->execute()) {
-						throw new DBExecuteStmtException($db, $stmt);
+						throw new Exceptions\DBExecuteStmtException($db, $stmt);
 					}
 
 					$stmt2->close();
diff --git a/classes/PaymentSchedule.php b/classes/PaymentSchedule.php
index 511a728..a0ac208 100644
--- a/classes/PaymentSchedule.php
+++ b/classes/PaymentSchedule.php
@@ -1,13 +1,12 @@
 <?php
+namespace StartupAPI;
 
 /**
+ * Every account is associated with existing Plan using Plan ID and PaymentSchedule using PaymentScheduleID.
+ *
  * @package StartupAPI
  * @subpackage Subscriptions
  */
-
-/**
- * Every account is associated with existing Plan using Plan ID and PaymentSchedule using PaymentScheduleID.
- */
 class PaymentSchedule {
 
 	/**
diff --git a/classes/Plan.php b/classes/Plan.php
index fcbfd50..4ff6c5f 100644
--- a/classes/Plan.php
+++ b/classes/Plan.php
@@ -1,14 +1,12 @@
 <?php
+namespace StartupAPI;
 
 /**
+ * Every account is associated with existing Plan using Plan Slug and PaymentSchedule using PaymentSchedule Slug.
+ *
  * @package StartupAPI
  * @subpackage Subscriptions
  */
-require_once (__DIR__ . '/PaymentSchedule.php');
-
-/**
- * Every account is associated with existing Plan using Plan Slug and PaymentSchedule using PaymentSchedule Slug.
- */
 class Plan {
 
 	/**
@@ -99,15 +97,15 @@ class Plan {
 	public function __construct($slug, $settings) {
 
 		if (!$slug) {
-			throw new Exception("Plan slug is required");
+			throw new \Exception("Plan slug is required");
 		}
 
 		if (!is_array($settings)) {
-			throw new Exception("Configuration array required");
+			throw new \Exception("Configuration array required");
 		}
 
 		if (!array_key_exists('name', $settings) && $settings['name']) {
-			throw new Exception("Mandatory parameter 'name' was not found in init array for plan $slug");
+			throw new \Exception("Mandatory parameter 'name' was not found in init array for plan $slug");
 		}
 
 		// mandatory parameters checked above
@@ -150,11 +148,11 @@ public function __construct($slug, $settings) {
 
 		# Check user hooks
 		if (!is_null($this->account_activate_hook) && !is_callable($this->account_activate_hook)) {
-			throw new Exception("Activate hook defined, but is not callable");
+			throw new \Exception("Activate hook defined, but is not callable");
 		}
 
 		if (!is_null($this->account_deactivate_hook) && !is_callable($this->account_deactivate_hook)) {
-			throw new Exception("Deactivate hook defined, but is not callable");
+			throw new \Exception("Deactivate hook defined, but is not callable");
 		}
 
 		// register new plan globally
@@ -377,12 +375,12 @@ public function deactivateHook($account_id, $new_plan_slug, $new_schedule_slug,
 	public static function init($plan_parameters) {
 
 //    if (count(self::$Plans))
-//      throw new Exception("Already initialized");
+//      throw new \Exception("Already initialized");
 
 		self::$plans = array(); // Isn't it an init?
 
 		if (!is_array($plan_parameters)) {
-			throw new Exception("Plan parameters is not an array");
+			throw new \Exception("Plan parameters is not an array");
 		}
 
 		foreach ($plan_parameters as $slug => $param) {
diff --git a/classes/RealClock.php b/classes/RealClock.php
new file mode 100644
index 0000000..d84b10e
--- /dev/null
+++ b/classes/RealClock.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * @package StartupAPI
+ */
+class RealClock extends Clock {
+  function _getDateTime()
+  {
+    return new DateTime();
+  }
+}
diff --git a/classes/Setting.php b/classes/Setting.php
new file mode 100644
index 0000000..7744fb4
--- /dev/null
+++ b/classes/Setting.php
@@ -0,0 +1,260 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * @package StartupAPI
+ */
+class Setting {
+  private $type;
+  private $name;
+  private $description;
+  private $options;
+
+  const TYPE_BOOLEAN     = 'boolean';
+  const TYPE_INT         = 'int';
+  const TYPE_USER_ID     = 'user-id';
+  const TYPE_SECONDS     = 'seconds';
+  const TYPE_MINUTES     = 'minutes';
+  const TYPE_DAYS        = 'days';
+  const TYPE_SECRET      = 'secret';
+  const TYPE_STRING      = 'string';
+  const TYPE_PATH        = 'path';
+  const TYPE_URL         = 'url';
+  const TYPE_COOKIE_KEY  = 'cookie-key';
+  const TYPE_CALLABLE    = 'callable';
+
+  const TYPE_BOOLEAN_ARRAY     = 'boolean[]';
+  const TYPE_INT_ARRAY         = 'int[]';
+  const TYPE_USER_ID_ARRAY     = 'user-id[]';
+  const TYPE_SECONDS_ARRAY     = 'seconds[]';
+  const TYPE_MINUTES_ARRAY     = 'minutes[]';
+  const TYPE_DAYS_ARRAY        = 'days[]';
+  const TYPE_SECRET_ARRAY      = 'secret[]';
+  const TYPE_STRING_ARRAY      = 'string[]';
+  const TYPE_PATH_ARRAY        = 'path[]';
+  const TYPE_URL_ARRAY         = 'url[]';
+  const TYPE_COOKIE_KEY_ARRAY  = 'cookie-key[]';
+  const TYPE_CALLABLE_ARRAY    = 'callable[]';
+
+  function __construct($type, $name, $description, $options = array()) {
+    $this->type = $type;
+    $this->name = $name;
+    $this->description = $description;
+    $this->options = $options;
+  }
+
+  public function getName() {
+    return $this->name;
+  }
+
+  public function getType() {
+    return $this->type;
+  }
+
+  public function getDescription() {
+    return $this->description;
+  }
+
+  private static function type2PHPType($type) {
+    if ($type == self::TYPE_BOOLEAN) {
+      return 'boolean';
+    }
+
+    if ($type == self::TYPE_CALLABLE) {
+      return 'callable';
+    }
+
+    if ($type == self::TYPE_INT
+      || $type == self::TYPE_SECONDS
+      || $type == self::TYPE_MINUTES
+      || $type == self::TYPE_DAYS
+      || $type == self::TYPE_USER_ID
+    ) {
+      return 'int';
+    }
+    if ($type == self::TYPE_STRING
+      || self::TYPE_PATH
+      || self::TYPE_URL
+      || self::TYPE_COOKIE_KEY
+      || self::TYPE_SECRET
+      || self::TYPE_COOKIE_KEY
+      || self::TYPE_COOKIE_KEY
+    ) {
+      return 'string';
+    }
+
+    return $type;
+  }
+
+  /**
+   * Returns PHP types of the configuration variables
+   *
+   * @param string $this->type StartupAPI configuration value type
+   * @return string PHP type of the variable
+   */
+  public function phpType() {
+    if ($this->type == self::TYPE_BOOLEAN_ARRAY) { return self::type2PHPType(self::TYPE_BOOLEAN). '[]'; }
+    if ($this->type == self::TYPE_INT_ARRAY) { return self::type2PHPType(self::TYPE_INT). '[]'; }
+    if ($this->type == self::TYPE_USER_ID_ARRAY) { return self::type2PHPType(self::TYPE_USER_ID). '[]'; }
+    if ($this->type == self::TYPE_SECONDS_ARRAY) { return self::type2PHPType(self::TYPE_SECONDS). '[]'; }
+    if ($this->type == self::TYPE_MINUTES_ARRAY) { return self::type2PHPType(self::TYPE_MINUTES). '[]'; }
+    if ($this->type == self::TYPE_DAYS_ARRAY) { return self::type2PHPType(self::TYPE_DAYS). '[]'; }
+    if ($this->type == self::TYPE_SECRET_ARRAY) { return self::type2PHPType(self::TYPE_SECRET). '[]'; }
+    if ($this->type == self::TYPE_STRING_ARRAY) { return self::type2PHPType(self::TYPE_STRING). '[]'; }
+    if ($this->type == self::TYPE_PATH_ARRAY) { return self::type2PHPType(self::TYPE_PATH). '[]'; }
+    if ($this->type == self::TYPE_URL_ARRAY) { return self::type2PHPType(self::TYPE_URL). '[]'; }
+    if ($this->type == self::TYPE_COOKIE_KEY_ARRAY) { return self::type2PHPType(self::TYPE_COOKIE_KEY). '[]'; }
+    if ($this->type == self::TYPE_CALLABLE_ARRAY) { return self::type2PHPType(self::TYPE_CALLABLE). '[]'; }
+
+    return self::type2PHPType($this->type);
+  }
+  /**
+   * Prints PHP value to be included in a code snippen
+   *
+   * @param string $this->type PHP variable type: 'boolean', 'int', 'string' and special type 'secret' for variables to not be shown in UI
+   * @param mixed $value Value of the variable
+   */
+  function code($value, $value_only = false) {
+    $setting_info = array(
+      'type' => $this->type,
+      'php_type' => $this->phpType(),
+      'description' => $this->description,
+      'name' => $this->name,
+      'value' => $value
+    );
+
+  	if (substr($this->type, -2) == '[]' && is_array($value)) {
+      $code_html = $value_only ? '' : rtrim(StartupAPI::$template->render(
+        '@startupapi-admin/settings/code/code.html.twig',
+        $setting_info
+      )) . ' ';
+
+      $code_html .= 'array(';
+  		$first = true;
+  		foreach ($value as $val) {
+  			if (!$first) {
+  				$code_html .= ', ';
+  			}
+        $sub_setting = new self(substr($this->type, 0, -2), $this->name, $this->description, $this->options);
+  			$code_html .= rtrim($sub_setting->code($val, TRUE));
+  			$first = false;
+  		}
+  		$code_html .= ')' . ($value_only ? '' : ';');
+  		return $code_html;
+  	}
+
+    if (is_null($value)) {
+      $template = '@startupapi-admin/settings/code/null.html.twig';
+  	} else if ($this->type == self::TYPE_BOOLEAN) {
+      $template = '@startupapi-admin/settings/code/boolean.html.twig';
+  	} else if ($this->type == self::TYPE_INT
+      || $this->type == self::TYPE_USER_ID
+      || $this->type == self::TYPE_SECONDS
+      || $this->type == self::TYPE_MINUTES
+      || $this->type == self::TYPE_DAYS
+    ) {
+      $template = '@startupapi-admin/settings/code/value.html.twig';
+  	} else if ($this->type == self::TYPE_SECRET) {
+      $template = '@startupapi-admin/settings/code/secret.html.twig';
+  	} else if ($this->type == self::TYPE_STRING
+      || $this->type == self::TYPE_PATH
+      || $this->type == self::TYPE_URL
+      || $this->type == self::TYPE_COOKIE_KEY
+    ) {
+      $template = '@startupapi-admin/settings/code/string.html.twig';
+  	} else if ($this->type == self::TYPE_CALLABLE) {
+  		if (is_string($value)) {
+        $template = '@startupapi-admin/settings/code/callable_string.html.twig';
+  		} else if (is_array($value)) {
+        $template = '@startupapi-admin/settings/code/callable_array.html.twig';
+  		} else if (get_class($value) == 'Closure') {
+        $setting_info['arguments'] = array_map(function($argument) {
+              return '$' . $argument;
+        }, is_array($this->options) && array_key_exists('arguments', $this->options) ? $this->options['arguments'] : array());
+
+        $template = '@startupapi-admin/settings/code/callable_closure.html.twig';
+  		}
+  	} else {
+      $setting_info['var_export'] = var_export($value, true);
+      $template = '@startupapi-admin/settings/code/unknown.html.twig';
+  	}
+
+    return $code_html = ($value_only ? '' : rtrim(StartupAPI::$template->render(
+      '@startupapi-admin/settings/code/code.html.twig',
+      $setting_info
+    )) . ' ') . rtrim(StartupAPI::$template->render(
+      $template,
+      $setting_info
+    )) . ($value_only ? '' : ';');
+  }
+
+  /**
+   * Prints setting value in a way appropriate for a type of the variable
+   *
+   * @param string $this->type Setting type: 'boolean', 'seconds', 'path', 'url', 'secret', 'cookie-key'
+   * @param mixed $value Value of the setting
+   * @param mixed[] $options Array of additional options that might be needed by some types
+   */
+  function value($value) {
+  	if (is_null($value)) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/null.html.twig',
+        array('value' => $value));
+  	} else if ($this->type == self::TYPE_BOOLEAN) {
+  		$true_string = array_key_exists('true_string', $this->options)
+        ? $this->options['true_string'] : 'yes';
+
+  		$false_string = array_key_exists('false_string', $this->options)
+        ? $this->options['false_string'] : 'no';
+
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/boolean.html.twig',
+        array('value' => $value, 'true_string' => $true_string, 'false_string' => $false_string));
+  	} else if ($this->type == self::TYPE_SECONDS) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/seconds.html.twig',
+        array('seconds' => $value, 'days' => intval($value / 60 / 60 / 24)));
+  	} else if ($this->type == self::TYPE_MINUTES) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/minutes.html.twig',
+        array('minutes' => $value, 'days' => intval($value / 60 / 24)));
+    } else if ($this->type == self::TYPE_DAYS) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/days.html.twig',
+        array('days' => $value));
+    } else if ($this->type == self::TYPE_PATH) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/path.html.twig',
+        array('path' => $value));
+    } else if ($this->type == self::TYPE_URL) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/url.html.twig',
+        array('url' => $value));
+    } else if ($this->type == self::TYPE_SECRET) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/secret.html.twig',
+        array('url' => $value));
+    } else if ($this->type == self::TYPE_COOKIE_KEY) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/cookie_key.html.twig',
+        array('key' => $value));
+    } else if ($this->type == self::TYPE_INT) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/int.html.twig',
+        array('value' => $value));
+    } else if ($this->type == self::TYPE_STRING) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/string.html.twig',
+        array('value' => $value));
+    } else if ($this->type == self::TYPE_USER_ID) {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/user_id.html.twig',
+        array('id' => $value, 'name' => User::getUser($value)->getName()));
+    } else if ($this->type == self::TYPE_CALLABLE) {
+      $arguments = is_array($this->options) && array_key_exists('arguments', $this->options)
+          ? $this->options['arguments'] : array();
+
+      if (is_string($value)) {
+        return StartupAPI::$template->render('@startupapi-admin/settings/value/callable.html.twig',
+          array('value' => $value, 'arguments' => $arguments));
+      } else if (is_array($value)) {
+        return StartupAPI::$template->render('@startupapi-admin/settings/value/callable.html.twig',
+          array('value' => $value[0] . '::' . $value[1], 'arguments' => $arguments));
+      } else if (get_class($value) == 'Closure') {
+        return StartupAPI::$template->render('@startupapi-admin/settings/value/callable_closure.html.twig',
+          array('arguments' => $arguments));
+      }
+    } else {
+      return StartupAPI::$template->render('@startupapi-admin/settings/value/var_export.html.twig',
+        array('var_export' => var_export($value, true)));
+  	}
+  }
+}
diff --git a/classes/StartupAPI.php b/classes/StartupAPI.php
index 4db270d..d24efd5 100644
--- a/classes/StartupAPI.php
+++ b/classes/StartupAPI.php
@@ -1,13 +1,8 @@
 <?php
-
-require_once(__DIR__ . '/User.php');
-require_once(__DIR__ . '/Plan.php');
-require_once(__DIR__ . '/CampaignTracker.php');
-
-require_once(__DIR__ . '/API/Endpoint.php');
+namespace StartupAPI;
 
 require_once(dirname(__DIR__) . '/twig/lib/Twig/Autoloader.php');
-Twig_Autoloader::register();
+\Twig_Autoloader::register();
 
 /**
  * StartupAPI class contains some global static functions and entry points for API
@@ -24,7 +19,7 @@ class StartupAPI {
 	/**
 	 * @var int Startup API minor version - to be incremented automatically when asked for
 	 */
-	private static $minor_version = 8;
+	private static $minor_version = 9;
 
 	/**
 	 * @var int	Startup API patch level (version number) - to be incremented automatically when build script is ran
@@ -170,13 +165,13 @@ static function init() {
 		}
 
 		// Configuring the templating
-		$loader = new Twig_Loader_Filesystem(__DIR__);
+		$loader = new \Twig_Loader_Filesystem(__DIR__);
 		foreach ($template_folders as $folder) {
 			$loader->addPath($folder, 'startupapi');
 		}
 		$loader->addPath(dirname(__DIR__) . '/admin/templates', 'startupapi-admin');
 
-		self::$template = new Twig_Environment($loader, UserConfig::$twig_options);
+		self::$template = new \Twig_Environment($loader, UserConfig::$twig_options);
 
 		// StartupAPI apis
 		if (UserConfig::$enable_startupapi_apis) {
@@ -200,20 +195,19 @@ public static function getTemplateInfo() {
 			foreach ($section['groups'] as $group) {
 				foreach ($group['settings'] as $setting) {
 					// don't make secret values available to templates
-					if ($setting['type'] == 'secret') {
+					if ($setting->getType() == Setting::TYPE_SECRET) {
 						continue;
 					}
 
-					$setting_type = $setting['type'];
-					$var_type = self::phpType($setting_type);
+					$var_type = $setting::phpType();
 					if (substr($var_type, -2) == '[]') {
 						$var_type = substr($var_type, 0, -2);
 					}
 					if ($var_type == 'int' || $var_type == 'string' || $var_type == 'boolean') {
-						if (substr($setting_type, -2) == '[]' && !is_array(UserConfig::${$setting['name']})) {
+						if (substr($setting_type, -2) == '[]' && !is_array(UserConfig::${$setting->getName()})) {
 							continue;
 						}
-						$config_info[$setting['name']] = UserConfig::${$setting['name']};
+						$config_info[$setting->getName()] = UserConfig::${$setting->getName()};
 					}
 				}
 			}
@@ -321,156 +315,4 @@ public static function getTemplateInfo() {
 		);
 	}
 
-	/**
-	 * Returns PHP types of the configuration variables
-	 *
-	 * @param string $type StartupAPI configuration value type
-	 * @return string PHP type of the variable
-	 */
-	public static function phpType($type) {
-		if (substr($type, -2) == '[]') {
-			return self::phpType(substr($type, 0, -2)) . '[]';
-		}
-
-		if ($type == 'seconds') {
-			return 'int';
-		}
-		if ($type == 'minutes') {
-			return 'int';
-		}
-		if ($type == 'days') {
-			return 'int';
-		}
-		if ($type == 'path') {
-			return 'string';
-		}
-		if ($type == 'url') {
-			return 'string';
-		}
-		if ($type == 'cookie-key') {
-			return 'string';
-		}
-		if ($type == 'secret') {
-			return 'string';
-		}
-		if ($type == 'user-id') {
-			return 'int';
-		}
-
-		return $type;
-	}
-
-}
-
-/**
- * Exception superclass used for all exceptions in StartupAPI
- *
- * @package StartupAPI
- */
-class StartupAPIException extends Exception {
-
-	/**
-	 * General Startup API Exception
-	 *
-	 * @param string $message Exception message
-	 * @param int $code Exception code
-	 * @param Exception $previous Previous exception in the chain
-	 */
-	function __construct($message, $code = null, $previous = null) {
-		parent::__construct('[StartupAPI] ' . $message, $code, $previous);
-	}
-
-}
-
-/**
- * Exception thrown when deprecated method is called
- *
- * Replace deprecated code with this exception to make sure instances that use
- * deprecated functionality have last warning to remove it.
- *
- * @package StartupAPI
- */
-class StartupAPIDeprecatedException extends StartupAPIException {
-
-}
-
-/**
- * Exception for database-related problems
- *
- * @package StartupAPI
- */
-class DBException extends StartupAPIException {
-
-	/**
-	 * Creates a database-related exception
-	 *
-	 * @param mysqli $db MySQLi database object
-	 * @param mysqli_stmt $stmt MySQLi database statement
-	 * @param string $message Exception message
-	 * @param int $code Exception code
-	 * @param Exception $previous Previous exception in the chain
-	 */
-	function __construct(mysqli $db = null, $stmt = null, $message = null, $code = null, $previous = null) {
-		$exception_message = $message;
-
-		$class = get_class($this);
-		$file = self::getFile();
-		$line = self::getLine();
-
-		if (is_null($db)) {
-			$exception_message = "[$class] Can't connect to database, \$db object is null (in $file on line $line)";
-		} else if ($db->connect_error) {
-			$exception_message = "[$class] Can't connect to database: (" . $db->connect_errno . ") " .
-					$db->connect_error . " (in $file on line $line)";
-		} else if ($db->error) {
-			$exception_message = "[$class] DB Error: " . $db->error . " (in $file on line $line)";
-		} else if (!$stmt) {
-			$exception_message = "[$class]" .
-					' $db->error: ' . $db->error .
-					' with message: ' . $message . " (in $file on line $line)";
-		} else {
-			$exception_message = "[$class]" .
-					' $stmt->error: ' . $stmt->error .
-					' with message: ' . $message . " (in $file on line $line)";
-		}
-
-		parent::__construct($exception_message, $code, $previous);
-	}
-
-}
-
-/**
- * Paremeter Binding Exception
- *
- * @package StartupAPI
- */
-class DBBindParamException extends DBException {
-
-}
-
-/**
- * Result binding Exception
- *
- * @package StartupAPI
- */
-class DBBindResultException extends DBException {
-
-}
-
-/**
- * Statement Execution Exception
- *
- * @package StartupAPI
- */
-class DBExecuteStmtException extends DBException {
-
-}
-
-/**
- * Statement preparation Exception
- *
- * @package StartupAPI
- */
-class DBPrepareStmtException extends DBException {
-
 }
diff --git a/classes/StartupAPIModule.php b/classes/StartupAPIModule.php
index 62aacff..cbb5cfd 100644
--- a/classes/StartupAPIModule.php
+++ b/classes/StartupAPIModule.php
@@ -1,28 +1,5 @@
 <?php
-
-require_once(dirname(__DIR__) . '/global.php');
-
-/**
- * Adding an interface to allow defining unimplemented static methods
- */
-interface StartupAPIModuleInterface {
-
-	/**
-	 * Returns module ID string
-	 *
-	 * Each module must implement this method and use unique ID
-	 *
-	 * @return string Unique module ID
-	 */
-	public function getID();
-
-	/**
-	 * Returns human readable module name for a class of modules
-	 *
-	 * @return string Module name
-	 */
-	public static function getModulesTitle();
-}
+namespace StartupAPI;
 
 /**
  * StartupAPI module class
@@ -36,6 +13,96 @@ public static function getModulesTitle();
  */
 abstract class StartupAPIModule implements StartupAPIModuleInterface {
 
+	/**
+	 * List of builtin module categories user in admin UI
+	 *
+	 * @var array
+	 */
+	public static $module_categories = array(
+		'auth' => array(
+			'title' => 'Authentication modules'
+		),
+		'email' => array(
+			'title' => 'Email module'
+		),
+		'payment' => array(
+			'title' => 'Payment engines'
+		)
+	);
+
+	/**
+	 * List of builtin modules used in admin UI and for module autoloading
+	 *
+	 * @var array
+	 */
+	public static $builtin_modules = array(
+		'usernamepass' => array(
+			'class' => 'UsernamePasswordAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'email' => array(
+			'class' => 'EmailAuthenticationModule',
+			'experimental' => true,
+			'category_slug' => 'auth'
+		),
+		'facebook' => array(
+			'class' => 'FacebookAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'twitter' => array(
+			'class' => 'TwitterAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'google' => array(
+			'class' => 'GoogleAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'linkedin' => array(
+			'class' => 'LinkedInAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'meetup' => array(
+			'class' => 'MeetupAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'etsy' => array(
+			'class' => 'EtsyAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'foursquare' => array(
+			'class' => 'FoursquareAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'github' => array(
+			'class' => 'GithubAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'instagram' => array(
+			'class' => 'InstagramAuthenticationModule',
+			'category_slug' => 'auth'
+		),
+		'mailchimp' => array(
+			'class' => 'MailChimpModule',
+			'experimental' => true,
+			'category_slug' => 'email'
+		),
+		'manual' => array(
+			'class' => 'ManualPaymentEngine',
+			'experimental' => true,
+			'category_slug' => 'payment'
+		),
+		'external_payment' => array(
+			'class' => 'ExternalPaymentEngine',
+			'experimental' => true,
+			'category_slug' => 'payment'
+		),
+		'stripe' => array(
+			'class' => 'StripePaymentEngine',
+			'experimental' => true,
+			'category_slug' => 'payment'
+		)
+	);
+
 	/**
 	 * Creates new module and registers it with the system
 	 */
@@ -133,7 +200,3 @@ public static function get($slug) {
 	}
 
 }
-
-require_once(__DIR__ . '/AuthenticationModule.php');
-require_once(__DIR__ . '/EmailModule.php');
-require_once(__DIR__ . '/PaymentEngine.php');
diff --git a/classes/StartupAPIModuleInterface.php b/classes/StartupAPIModuleInterface.php
new file mode 100644
index 0000000..d55cb65
--- /dev/null
+++ b/classes/StartupAPIModuleInterface.php
@@ -0,0 +1,27 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * Adding an interface to allow defining unimplemented static methods
+ *
+ * @package StartupAPI
+ * @subpackage Extensions
+ */
+interface StartupAPIModuleInterface {
+
+	/**
+	 * Returns module ID string
+	 *
+	 * Each module must implement this method and use unique ID
+	 *
+	 * @return string Unique module ID
+	 */
+	public function getID();
+
+	/**
+	 * Returns human readable module name for a class of modules
+	 *
+	 * @return string Module name
+	 */
+	public static function getModulesTitle();
+}
diff --git a/classes/TransactionLogger.php b/classes/TransactionLogger.php
index 7f76333..7a9d67f 100644
--- a/classes/TransactionLogger.php
+++ b/classes/TransactionLogger.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * Helper class to facilitate logging for subscription transactions
@@ -26,15 +27,15 @@ public static function log($account_id, $engine_slug, $amount, $message) {
 
 		if (!($stmt = $db->prepare('INSERT INTO u_transaction_log
 			(date_time, account_id, engine_slug, amount, message) VALUES (NOW(), ?, ?, ?, ?)'))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('isds', $account_id, $engine_slug, $amount, $message)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		$id = $db->insert_id;
@@ -69,7 +70,7 @@ public static function getAccountTransactions($account_id, $from = NULL, $to = N
 				(is_null($offset) ? '' : ' OFFSET ?');
 
 		if (!($stmt = $db->prepare($query))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$params = array();
@@ -90,15 +91,15 @@ public static function getAccountTransactions($account_id, $from = NULL, $to = N
 		}
 
 		if (!call_user_func_array(array($stmt, 'bind_param'), $params)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($t_id, $date_time, $engine_slug, $amount, $message)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		$t = array();
diff --git a/classes/User.php b/classes/User.php
index 6a8de02..a7367dd 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -1,12 +1,5 @@
 <?php
-
-require_once(dirname(__DIR__) . '/global.php');
-require_once(__DIR__ . '/Account.php');
-require_once(__DIR__ . '/Badge.php');
-require_once(__DIR__ . '/CookieStorage.php');
-require_once(__DIR__ . '/CampaignTracker.php');
-require_once(__DIR__ . '/Invitation.php');
-require_once(dirname(__DIR__) . '/swiftmailer/lib/swift_required.php');
+namespace StartupAPI;
 
 /**
  * This class represents a registerd user in the system
@@ -152,7 +145,7 @@ public static function get($allow_impersonation = true) {
 	/**
 	 * Updates user activity when user returns to the site more then a day after last access
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 *
 	 * @internal
 	 */
@@ -166,7 +159,7 @@ public static function updateReturnActivity() {
 
 		$last = $storage->fetch(UserConfig::$last_login_key);
 		if (!$storage->store(UserConfig::$last_login_key, time())) {
-			throw new StartupAPIException(implode('; ', $storage->errors));
+			throw new Exceptions\StartupAPIException(implode('; ', $storage->errors));
 		}
 
 		$user = self::get();
@@ -186,7 +179,7 @@ public static function updateReturnActivity() {
 	/**
 	 * Sets user's referrer based on CampaignTracker's information
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Should not be used other then by login methods
 	 */
@@ -200,15 +193,15 @@ private function setReferer() {
 
 		if ($stmt = $db->prepare('UPDATE u_users SET referer = ? WHERE id = ?')) {
 			if (!$stmt->bind_param('si', $referer, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -217,7 +210,7 @@ private function setReferer() {
 	 *
 	 * @return string Referer URL
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getReferer() {
 		$db = UserConfig::getDB();
@@ -226,19 +219,19 @@ public function getReferer() {
 
 		if ($stmt = $db->prepare('SELECT referer FROM u_users WHERE id = ?')) {
 			if (!$stmt->bind_param('i', $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->bind_result($referer)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $referer;
@@ -251,7 +244,7 @@ public function getReferer() {
 	 *
 	 * @return array Array with URLs as keys and values are arrays of users
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getReferers($days = 30) {
 		$db = UserConfig::getDB();
@@ -260,13 +253,13 @@ public static function getReferers($days = 30) {
 
 		if ($stmt = $db->prepare('SELECT referer, id, status, name, username, email, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE referer IS NOT NULL AND regtime > DATE_SUB(NOW(), INTERVAL ? DAY) ORDER BY regtime DESC')) {
 			if (!$stmt->bind_param('i', $days)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($referer, $userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -275,7 +268,7 @@ public static function getReferers($days = 30) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $sources;
@@ -284,7 +277,7 @@ public static function getReferers($days = 30) {
 	/**
 	 * Sets user's campaign they came from
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used by login/registration scripts to record user's campaign
 	 */
@@ -331,15 +324,15 @@ private function setRegCampaign() {
 			reg_cmp_name_id = ?
 			WHERE id = ?')) {
 			if (!$stmt->bind_param('sssssi', $cmp_source_id, $cmp_medium_id, $cmp_keywords_id, $cmp_content_id, $cmp_name_id, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -348,7 +341,7 @@ private function setRegCampaign() {
 	 *
 	 * @return array Array of campaign parameters
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getCampaign() {
 		$db = UserConfig::getDB();
@@ -364,13 +357,13 @@ public function getCampaign() {
 				LEFT JOIN u_cmp_source AS cmp_source ON users.reg_cmp_source_id = cmp_source.id
 			WHERE users.id = ?')) {
 			if (!$stmt->bind_param('i', $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($cmp_name, $cmp_content, $cmp_keywords, $cmp_medium, $cmp_source)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -383,7 +376,7 @@ public function getCampaign() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $campaign;
@@ -396,7 +389,7 @@ public function getCampaign() {
 	 *
 	 * @return array Array of campaign users data
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getCampaigns($days = 30) {
 		$db = UserConfig::getDB();
@@ -420,13 +413,13 @@ public static function getCampaigns($days = 30) {
 				)
 				ORDER BY regtime DESC')) {
 			if (!$stmt->bind_param('i', $days)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($cmp_name, $cmp_content, $cmp_keywords, $cmp_medium, $cmp_source, $userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -451,7 +444,7 @@ public static function getCampaigns($days = 30) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $campaigns;
@@ -477,7 +470,7 @@ public function createPersonalAccount($set_as_current = true) {
 	 *
 	 * @return Invitation
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getInvitation() {
 		return Invitation::getUserInvitation($this);
@@ -486,20 +479,22 @@ public function getInvitation() {
 	/**
 	 * This method is called when new user is created
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	private function init() {
-		$invitation_code = $_SESSION[UserConfig::$invitation_code_key];
-		unset($_SESSION[UserConfig::$invitation_code_key]);
-
 		$invitation = null;
-		if (!is_null($invitation_code)) {
-			$invitation = Invitation::getByCode($invitation_code);
-		}
+		if (array_key_exists(UserConfig::$invitation_code_key, $_SESSION)) {
+			$invitation_code = $_SESSION[UserConfig::$invitation_code_key];
+			unset($_SESSION[UserConfig::$invitation_code_key]);
 
-		if (!is_null($invitation)) {
-			$invitation->setUser($this);
-			$invitation->save();
+			if (!is_null($invitation_code)) {
+				$invitation = Invitation::getByCode($invitation_code);
+			}
+
+			if (!is_null($invitation)) {
+				$invitation->setUser($this);
+				$invitation->save();
+			}
 		}
 
 		$db = UserConfig::getDB();
@@ -508,14 +503,14 @@ private function init() {
 
 		if ($stmt = $db->prepare('INSERT INTO u_user_preferences (user_id) VALUES (?)')) {
 			if (!$stmt->bind_param('i', $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt, "Can't update user preferences (set current account)");
+				throw new Exceptions\DBExecuteStmtException($db, $stmt, "Can't update user preferences (set current account)");
 			}
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db, "Can't update user preferences (set current account)");
+			throw new Exceptions\DBPrepareStmtException($db, "Can't update user preferences (set current account)");
 		}
 
 		$invitation_account = null;
@@ -568,7 +563,7 @@ private function init() {
 	 *
 	 * @return boolean Is code associated with a user or not
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function verifyEmailLinkCode($code, User $user = null) {
 		$db = UserConfig::getDB();
@@ -604,24 +599,24 @@ public static function verifyEmailLinkCode($code, User $user = null) {
 		if ($stmt = $db->prepare($query)) {
 			if (is_null($user)) {
 				if (!$stmt->bind_param('si', $code, UserConfig::$emailVerificationCodeExpiresInDays)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 			} else {
 				$user_id = $user->getID();
 
 				if (!$stmt->bind_param('isi', $user_id, $code, UserConfig::$emailVerificationCodeExpiresInDays)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$verified = ($db->affected_rows == 1);
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $verified;
@@ -632,7 +627,7 @@ public static function verifyEmailLinkCode($code, User $user = null) {
 	 *
 	 * Generates a new verification code and sends it to the user's email address
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function sendEmailVerificationCode() {
 		$email = $this->getEmail();
@@ -652,15 +647,15 @@ public function sendEmailVerificationCode() {
 										email_verification_code_time = now()
 									WHERE id = ?')) {
 			if (!$stmt->bind_param('si', $code, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$verification_link = UserConfig::$USERSROOTFULLURL . '/verify_email.php?code=' . urlencode($code);
@@ -669,7 +664,7 @@ public function sendEmailVerificationCode() {
 
 		$subject = UserConfig::$emailVerificationSubject;
 
-		$message = Swift_Message::newInstance($subject, $message_body);
+		$message = \Swift_Message::newInstance($subject, $message_body);
 		$message->setFrom(array(UserConfig::$supportEmailFromEmail => UserConfig::$supportEmailFromName));
 		$message->setTo(array($email => $name));
 		$message->setReplyTo(array(UserConfig::$supportEmailReplyTo));
@@ -721,7 +716,7 @@ public function getAcceptedInvitations() {
 	 *
 	 * @return User Newly created user object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function createNewFacebookUser($name, $fb_id, $me = null) {
 		$name = mb_convert_encoding($name, 'UTF-8');
@@ -737,17 +732,17 @@ public static function createNewFacebookUser($name, $fb_id, $me = null) {
 
 		if ($stmt = $db->prepare("INSERT INTO u_users (name, regmodule, tos_version, email, fb_id) VALUES (?, 'facebook', ?, ?, ?)")) {
 			if (!$stmt->bind_param('sisi', $name, UserConfig::$currentTOSVersion, $email, $fb_id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$id = $stmt->insert_id;
 
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$user = self::getUser($id);
@@ -773,7 +768,7 @@ public static function createNewFacebookUser($name, $fb_id, $me = null) {
 	 *
 	 * @return User Newly created user object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function createNewWithoutCredentials(StartupAPIModule $module, $name, $email = null) {
 		$module_id = $module->getID();
@@ -791,16 +786,16 @@ public static function createNewWithoutCredentials(StartupAPIModule $module, $na
 
 		if ($stmt = $db->prepare('INSERT INTO u_users (name, email, regmodule, tos_version) VALUES (?, ?, ?, ?)')) {
 			if (!$stmt->bind_param('sssi', $name, $email, $module_id, UserConfig::$currentTOSVersion)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$id = $stmt->insert_id;
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$user = self::getUser($id);
@@ -824,7 +819,7 @@ public static function createNewWithoutCredentials(StartupAPIModule $module, $na
 	 *
 	 * @return User Newly created user object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function createNew($name, $username, $email, $password) {
 		$name = mb_convert_encoding($name, 'UTF-8');
@@ -840,16 +835,16 @@ public static function createNew($name, $username, $email, $password) {
 
 		if ($stmt = $db->prepare("INSERT INTO u_users (regmodule, tos_version, name, username, email, pass, salt) VALUES ('userpass', ?, ?, ?, ?, ?, ?)")) {
 			if (!$stmt->bind_param('isssss', UserConfig::$currentTOSVersion, $name, $username, $email, $pass, $salt)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			$id = $stmt->insert_id;
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$user = self::getUser($id);
@@ -864,7 +859,7 @@ public static function createNew($name, $username, $email, $password) {
 	/**
 	 * Deletes user from the system
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function delete() {
 
@@ -874,15 +869,15 @@ public function delete() {
 
 		if ($stmt = $db->prepare('DELETE FROM u_users WHERE username = ?')) {
 			if (!$stmt->bind_param('s', $username)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -891,7 +886,7 @@ public function delete() {
 	 *
 	 * @return int Total number of users (including disabled users)
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getTotalUsers() {
 		$db = UserConfig::getDB();
@@ -900,16 +895,16 @@ public static function getTotalUsers() {
 
 		if ($stmt = $db->prepare('SELECT COUNT(*) FROM u_users')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($total)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $total;
@@ -925,7 +920,7 @@ public static function getTotalUsers() {
 	 *
 	 * @return int Number of active users
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getActiveUsers($date = null) {
 		$db = UserConfig::getDB();
@@ -979,21 +974,21 @@ public static function getActiveUsers($date = null) {
 		if ($stmt = $db->prepare($query)) {
 			if (!is_null($date)) {
 				if (!$stmt->bind_param('ss', $date, $date)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 			}
 
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($total)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $total;
@@ -1006,7 +1001,7 @@ public static function getActiveUsers($date = null) {
 	 *
 	 * @return array Array of active users numbers for the requested period
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getDailyActiveUsers($lastndays = null) {
 		$db = UserConfig::getDB();
@@ -1028,16 +1023,16 @@ public static function getDailyActiveUsers($lastndays = null) {
 						' WHERE time > DATE_SUB(NOW(), INTERVAL ' . $lastndays . ' DAY)' : '')
 		)) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($start_date, $start_day, $start_month, $start_year)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		// no activities recorded yet
@@ -1051,10 +1046,10 @@ public static function getDailyActiveUsers($lastndays = null) {
 				((!is_null($lastndays) && is_int($lastndays)) ?
 						' WHERE day > DATE_SUB(NOW(), INTERVAL ' . $lastndays . ' DAY)' : ''))) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($date, $active_users)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1063,7 +1058,7 @@ public static function getDailyActiveUsers($lastndays = null) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$timestamp = mktime(0, 0, 1, $start_month, $start_day, $start_year);
@@ -1103,12 +1098,12 @@ public static function getDailyActiveUsers($lastndays = null) {
 
 			if ($stmt = $db->prepare($query)) {
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				$stmt->close();
 			} else {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 		}
 
@@ -1122,7 +1117,7 @@ public static function getDailyActiveUsers($lastndays = null) {
 	 *
 	 * @return array Array of activity counters for all dates when activity was recorded
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1133,13 +1128,13 @@ public static function getDailyPointsByActivity($activityid) {
 
 		if ($stmt = $db->prepare('SELECT CAST(time AS DATE) AS activity_date, count(*) AS cnt FROM u_activity WHERE activity_id = ? GROUP BY activity_date')) {
 			if (!$stmt->bind_param('i', $activityid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($date, $cnt)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1148,7 +1143,7 @@ public static function getDailyPointsByActivity($activityid) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $daily_activity;
@@ -1163,7 +1158,7 @@ public static function getDailyPointsByActivity($activityid) {
 	 *
 	 * @return array Array of arrays (data, activity, total) for all dates when activities were recorded
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1181,10 +1176,10 @@ public static function getDailyActivityPoints(User $user = null) {
 
 		if ($stmt = $db->prepare('SELECT CAST(time AS DATE) AS activity_date, activity_id, count(*) AS total FROM u_activity ' . $where . 'GROUP BY activity_date, activity_id')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($date, $id, $total)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1193,7 +1188,7 @@ public static function getDailyActivityPoints(User $user = null) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $daily_activity;
@@ -1203,7 +1198,7 @@ public static function getDailyActivityPoints(User $user = null) {
 	 * Aggregates activity points for users, should be ran within cron job
 	 * on a daily basis or more often if needed.
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function aggregateActivityPoints() {
 		$db = UserConfig::getDB();
@@ -1234,24 +1229,24 @@ public static function aggregateActivityPoints() {
 					{
 						if (!$stmt->execute())
 						{
-							throw new DBExecuteStmtException($db, $stmt);
+							throw new Exceptions\DBExecuteStmtException($db, $stmt);
 						}
 
 						$stmt->close();
 					} else {
-						throw new DBException($db);
+						throw new Exceptions\DBException($db);
 					}
 
 				} else {
-					throw new DBException($db);
+					throw new Exceptions\DBException($db);
 				}
 			} else {
-				throw new DBException($db);
+				throw new Exceptions\DBException($db);
 			}
 		}
 		else
 		{
-			throw new DBException($db);
+			throw new Exceptions\DBException($db);
 		}
 	}
 
@@ -1260,7 +1255,7 @@ public static function aggregateActivityPoints() {
 	 *
 	 * @return array Array of registration numbers for each date
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1271,10 +1266,10 @@ public static function getDailyRegistrations() {
 
 		if ($stmt = $db->prepare('SELECT CAST(regtime AS DATE) AS regdate, count(*) AS regs FROM u_users GROUP BY regdate')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($regdate, $regs)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1283,7 +1278,7 @@ public static function getDailyRegistrations() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $dailyregs;
@@ -1294,7 +1289,7 @@ public static function getDailyRegistrations() {
 	 *
 	 * @return array Array of arrays of registration numbers for each module for each date
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1305,10 +1300,10 @@ public static function getDailyRegistrationsByModule() {
 
 		if ($stmt = $db->prepare('SELECT CAST(regtime AS DATE) AS regdate, regmodule, count(*) AS reg FROM u_users GROUP BY regdate, regmodule')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($date, $module, $regs)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch()) {
@@ -1317,7 +1312,7 @@ public static function getDailyRegistrationsByModule() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $dailyregs;
@@ -1335,7 +1330,7 @@ public static function getDailyRegistrationsByModule() {
 	 *
 	 * @return array Array of recent registration counters for each authentication module
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used on admin dashboard
 	 */
@@ -1346,10 +1341,10 @@ public static function getRecentRegistrationsByModule() {
 
 		if ($stmt = $db->prepare('SELECT regmodule, count(*) AS reg FROM u_users u WHERE regtime > DATE_SUB(NOW(), INTERVAL 30 DAY) GROUP BY regmodule')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($module, $reg)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch()) {
@@ -1358,7 +1353,7 @@ public static function getRecentRegistrationsByModule() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $regs;
@@ -1413,7 +1408,7 @@ public function getUserCredentials($requested_module_id = null) {
 	 *
 	 * @return User[] Array of user objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard to show users
 	 */
@@ -1462,13 +1457,13 @@ public static function getUsers($pagenumber = 0, $perpage = 20, $sort = 'registr
 			}
 
 			if (!$result) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1477,7 +1472,7 @@ public static function getUsers($pagenumber = 0, $perpage = 20, $sort = 'registr
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $users;
@@ -1495,7 +1490,7 @@ public static function getUsers($pagenumber = 0, $perpage = 20, $sort = 'registr
 	 *
 	 * @return User[] Array of user objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1513,13 +1508,13 @@ public static function searchUsers($search, $pagenumber = 0, $perpage = 20, $sor
 
 		if ($stmt = $db->prepare('SELECT id, status, name, username, email, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE INSTR(name, ?) > 0 OR INSTR(username, ?) > 0 OR INSTR(email, ?) > 0 ORDER BY ' . $orderby . ' DESC LIMIT ?, ?')) {
 			if (!$stmt->bind_param('sssii', $search, $search, $search, $first, $perpage)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1528,7 +1523,7 @@ public static function searchUsers($search, $pagenumber = 0, $perpage = 20, $sor
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $users;
@@ -1547,7 +1542,7 @@ public static function searchUsers($search, $pagenumber = 0, $perpage = 20, $sor
 	 *
 	 * @return array Array of (time, user_id, activity_id) records
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1583,13 +1578,13 @@ public static function getUsersActivity($all, $pagenumber = 0, $perpage = 20) {
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->bind_param('ii', $first, $perpage)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($time, $user_id, $activity_id)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1598,7 +1593,7 @@ public static function getUsersActivity($all, $pagenumber = 0, $perpage = 20) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $activities;
@@ -1613,7 +1608,7 @@ public static function getUsersActivity($all, $pagenumber = 0, $perpage = 20) {
 	 *
 	 * @return array Array of (time, user_id) records
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1633,13 +1628,13 @@ public static function getUsersByActivity($activityid, $pagenumber = 0, $perpage
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->bind_param('iii', $activityid, $first, $perpage)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($time, $user_id)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1648,7 +1643,7 @@ public static function getUsersByActivity($activityid, $pagenumber = 0, $perpage
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $activities;
@@ -1663,7 +1658,7 @@ public static function getUsersByActivity($activityid, $pagenumber = 0, $perpage
 	 *
 	 * @return array Array of User objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUsersByEmailOrUsername($nameoremail) {
 		$db = UserConfig::getDB();
@@ -1674,13 +1669,13 @@ public static function getUsersByEmailOrUsername($nameoremail) {
 
 		if ($stmt = $db->prepare('SELECT id, status, name, username, email, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE username = ? OR email = ?')) {
 			if (!$stmt->bind_param('ss', $nameoremail, $nameoremail)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1689,7 +1684,7 @@ public static function getUsersByEmailOrUsername($nameoremail) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $users;
@@ -1704,7 +1699,7 @@ public static function getUsersByEmailOrUsername($nameoremail) {
 	 *
 	 * @return array Array of activity_id/count pairs
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1722,10 +1717,10 @@ public static function getActivityStatistics() {
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($activity_id, $cnt)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1734,7 +1729,7 @@ public static function getActivityStatistics() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $stats;
@@ -1749,7 +1744,7 @@ public static function getActivityStatistics() {
 	 *
 	 * @return array Array of (time, user_id, activity_id) records
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @internal Used in admin dashboard
 	 */
@@ -1780,13 +1775,13 @@ public function getActivity($all, $pagenumber = 0, $perpage = 20) {
 
 		if ($stmt = $db->prepare($query)) {
 			if (!$stmt->bind_param('iii', $this->userid, $first, $perpage)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($time, $user_id, $activity_id)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1795,7 +1790,7 @@ public function getActivity($all, $pagenumber = 0, $perpage = 20) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $activities;
@@ -1810,7 +1805,7 @@ public function getActivity($all, $pagenumber = 0, $perpage = 20) {
 	 *
 	 * @return string
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function generateTemporaryPassword() {
 		$db = UserConfig::getDB();
@@ -1820,15 +1815,15 @@ public function generateTemporaryPassword() {
 
 		if ($stmt = $db->prepare('UPDATE u_users SET temppass = ?, temppasstime = now() WHERE id = ?')) {
 			if (!$stmt->bind_param('si', $temppass, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $temppass;
@@ -1839,22 +1834,22 @@ public function generateTemporaryPassword() {
 	 *
 	 * @see generateTemporaryPassword
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function resetTemporaryPassword() {
 		$db = UserConfig::getDB();
 
 		if ($stmt = $db->prepare('UPDATE u_users SET temppass = null, temppasstime = null WHERE id = ?')) {
 			if (!$stmt->bind_param('s', $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -1865,7 +1860,7 @@ public function resetTemporaryPassword() {
 	 *
 	 * @param StartupAPIModule $module Startup API Module object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 *
 	 * @deprecated
 	 */
@@ -1876,15 +1871,15 @@ public function setRegistrationModule(StartupAPIModule $module) {
 
 		if ($stmt = $db->prepare('UPDATE u_users SET regmodule = ? WHERE id = ?')) {
 			if (!$stmt->bind_param('si', $module_id, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -1901,7 +1896,7 @@ public function setRegistrationModule(StartupAPIModule $module) {
 	 *
 	 * @return User[] Array of User objects
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUsersByIDs($userids) {
 		$db = UserConfig::getDB();
@@ -1923,10 +1918,10 @@ public static function getUsersByIDs($userids) {
 
 		if ($stmt = $db->prepare('SELECT id, status, name, username, email, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE id IN (' . $idlist . ')')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($userid, $status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -1935,7 +1930,7 @@ public static function getUsersByIDs($userids) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $users;
@@ -1952,7 +1947,7 @@ public static function getUsersByIDs($userids) {
 	 *
 	 * @return User|null User object or null if username and password do not match
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUserByUsernamePassword($entered_username, $entered_password) {
 		$db = UserConfig::getDB();
@@ -1961,13 +1956,13 @@ public static function getUserByUsernamePassword($entered_username, $entered_pas
 
 		if ($stmt = $db->prepare('SELECT id, status, name, username, email, pass, salt, temppass, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE username = ?')) {
 			if (!$stmt->bind_param('s', $entered_username)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($id, $status, $name, $username, $email, $pass, $salt, $temppass, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -1988,19 +1983,19 @@ public static function getUserByUsernamePassword($entered_username, $entered_pas
 				$user->resetTemporaryPassword();
 			}
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (is_null($user)) {
 			if ($stmt = $db->prepare('SELECT id, status, name, username, email, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE username = ? AND temppass = ? AND temppasstime > DATE_SUB(NOW(), INTERVAL 1 DAY)')) {
 				if (!$stmt->bind_param('ss', $entered_username, $entered_password)) {
-					throw new DBBindParamException($db, $stmt);
+					throw new Exceptions\DBBindParamException($db, $stmt);
 				}
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 				if (!$stmt->bind_result($id, $status, $name, $username, $email, $fb_id, $regtime, $points, $is_email_verified)) {
-					throw new DBBindResultException($db, $stmt);
+					throw new Exceptions\DBBindResultException($db, $stmt);
 				}
 
 				if ($stmt->fetch() === TRUE) {
@@ -2014,7 +2009,7 @@ public static function getUserByUsernamePassword($entered_username, $entered_pas
 					$user->save();
 				}
 			} else {
-				throw new DBPrepareStmtException($db);
+				throw new Exceptions\DBPrepareStmtException($db);
 			}
 		} else {
 			$user->resetTemporaryPassword();
@@ -2039,7 +2034,7 @@ public static function getUserByUsernamePassword($entered_username, $entered_pas
 	 *
 	 * @return User|null User object if user with such ID does not exist
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUserByFacebookID($fb_id) {
 		$db = UserConfig::getDB();
@@ -2048,13 +2043,13 @@ public static function getUserByFacebookID($fb_id) {
 
 		if ($stmt = $db->prepare('SELECT id, status, name, username, email, requirespassreset, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE fb_id = ?')) {
 			if (!$stmt->bind_param('i', $fb_id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($userid, $status, $name, $username, $email, $requirespassreset, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -2063,7 +2058,7 @@ public static function getUserByFacebookID($fb_id) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $user;
@@ -2076,7 +2071,7 @@ public static function getUserByFacebookID($fb_id) {
 	 *
 	 * @return User|null User object
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public static function getUser($userid) {
 		$db = UserConfig::getDB();
@@ -2085,13 +2080,13 @@ public static function getUser($userid) {
 
 		if ($stmt = $db->prepare('SELECT status, name, username, email, requirespassreset, fb_id, UNIX_TIMESTAMP(regtime), points, email_verified FROM u_users WHERE id = ?')) {
 			if (!$stmt->bind_param('i', $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($status, $name, $username, $email, $requirespassreset, $fb_id, $regtime, $points, $is_email_verified)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -2100,7 +2095,7 @@ public static function getUser($userid) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $user;
@@ -2111,7 +2106,7 @@ public static function getUser($userid) {
 	 *
 	 * @param string $return Return URL
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	private static function setReturn($return) {
 		$storage = new MrClay_CookieStorage(array(
@@ -2122,7 +2117,7 @@ private static function setReturn($return) {
 				));
 
 		if (!$storage->store(UserConfig::$session_return_key, $return)) {
-			throw new StartupAPIException(implode('; ', $storage->errors));
+			throw new Exceptions\StartupAPIException(implode('; ', $storage->errors));
 		}
 	}
 
@@ -2345,13 +2340,13 @@ public function getUsername() {
 	 *
 	 * @param string $username User's login name
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public function setUsername($username) {
 		if (is_null($this->username)) {
 			$this->username = $username;
 		} else {
-			throw new StartupAPIException('This user already has username set.');
+			throw new Exceptions\StartupAPIException('This user already has username set.');
 		}
 	}
 
@@ -2475,20 +2470,20 @@ public function isDisabled() {
 	 *
 	 * @return boolean True if password matches
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function checkPass($password) {
 		$db = UserConfig::getDB();
 
 		if ($stmt = $db->prepare('SELECT pass, salt FROM u_users WHERE id = ?')) {
 			if (!$stmt->bind_param('i', $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($pass, $salt)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -2497,7 +2492,7 @@ public function checkPass($password) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return false;
@@ -2508,7 +2503,7 @@ public function checkPass($password) {
 	 *
 	 * @param string $password New password
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function setPass($password) {
 		$db = UserConfig::getDB();
@@ -2518,15 +2513,15 @@ public function setPass($password) {
 
 		if ($stmt = $db->prepare('UPDATE u_users SET pass = ?, salt = ? WHERE id = ?')) {
 			if (!$stmt->bind_param('ssi', $pass, $salt, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
@@ -2542,19 +2537,19 @@ public function getSettings() {
 				WHERE user_id = ?')
 		) {
 			if (!$stmt->bind_param('i', $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->bind_result($json)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$settings = json_decode($json, true);
@@ -2574,22 +2569,22 @@ public function saveSettings($settings) {
 			SET app_settings_json = ? WHERE user_id = ?')
 		) {
 			if (!$stmt->bind_param('si', $json, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 	}
 
 	/**
 	 * Persists user's data into the database
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function save() {
 		$db = UserConfig::getDB();
@@ -2608,15 +2603,15 @@ public function save() {
 
 		if ($stmt = $db->prepare('UPDATE u_users SET status = ?, username = ?, name = ?, email = ?, email_verified = ?, requirespassreset = ?, fb_id = ? WHERE id = ?')) {
 			if (!$stmt->bind_param('isssiiii', $status, $username, $name, $email, $email_verifiednum, $passresetnum, $this->fbid, $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$old_email = $old_user->getEmail();
@@ -2637,7 +2632,7 @@ public function save() {
 	 *
 	 * @param boolean $remember Set to true to remember user beyond browser session (if globally enabled)
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public function setSession($remember) {
 		$storage = new MrClay_CookieStorage(array(
@@ -2649,7 +2644,7 @@ public function setSession($remember) {
 				));
 
 		if (!$storage->store(UserConfig::$session_userid_key, $this->userid)) {
-			throw new StartupAPIException(implode('; ', $storage->errors));
+			throw new Exceptions\StartupAPIException(implode('; ', $storage->errors));
 		}
 	}
 
@@ -2677,7 +2672,7 @@ public static function clearSession() {
 	 *
 	 * @return User|null New user object with current user associated with it as impersonator
 	 *
-	 * @throws StartupAPIException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public function impersonate($user) {
 		if (is_null($user) || $user->isTheSameAs($this)) {
@@ -2692,11 +2687,11 @@ public function impersonate($user) {
 				));
 
 		if (!$this->isAdmin()) {
-			throw new StartupAPIException('Not admin (userid: ' . $this->userid . ') is trying to impersonate another user (userid: ' . $user->userid . ')');
+			throw new Exceptions\StartupAPIException('Not admin (userid: ' . $this->userid . ') is trying to impersonate another user (userid: ' . $user->userid . ')');
 		}
 
 		if (!$storage->store(UserConfig::$impersonation_userid_key, $user->userid)) {
-			throw new StartupAPIException(implode('; ', $storage->errors));
+			throw new Exceptions\StartupAPIException(implode('; ', $storage->errors));
 		}
 
 		$user->impersonator = $this;
@@ -2731,7 +2726,7 @@ public static function stopImpersonation() {
 	 * Records user activity
 	 * @param int $activity_id ID of activity performed by the user
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function recordActivity($activity_id) {
 		if ($this->isImpersonated()) {
@@ -2745,28 +2740,28 @@ public function recordActivity($activity_id) {
 
 		if ($stmt = $db->prepare('INSERT INTO u_activity (user_id, activity_id) VALUES (?, ?)')) {
 			if (!$stmt->bind_param('ii', $this->userid, $activity_id)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		if ($stmt = $db->prepare('UPDATE u_users SET points = points + ? WHERE id = ?')) {
 			if (!$stmt->bind_param('ii', UserConfig::$activities[$activity_id][1], $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		$this->triggerActivityBadge($activity_id);
@@ -2789,7 +2784,7 @@ public function triggerActivityBadge($activity_id) {
 	 *
 	 * @return int Number of times any of the activities requested have happened
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getActivitiesCount($activity_ids, $period = null) {
 		$db = UserConfig::getDB();
@@ -2805,13 +2800,13 @@ public function getActivitiesCount($activity_ids, $period = null) {
 		if ($stmt = $db->prepare('SELECT count(*) as count FROM u_activity
 									WHERE user_id = ? AND activity_id IN (' . $in . ')')) {
 			if (!$stmt->bind_param('i', $this->userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($count)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			if ($stmt->fetch() === TRUE) {
@@ -2820,7 +2815,7 @@ public function getActivitiesCount($activity_ids, $period = null) {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $activity_count;
@@ -2840,8 +2835,8 @@ public function getAccounts() {
 	 *
 	 * @return array Array of Account, role pairs
 	 *
-	 * @throws DBException
-	 * @throws StartupAPIException
+	 * @throws Exceptions\DBException
+	 * @throws Exceptions\StartupAPIException
 	 */
 	public function getAccountsAndRoles() {
 		return Account::getUserAccountsAndRoles($this);
diff --git a/classes/UserConfig.php b/classes/UserConfig.php
new file mode 100644
index 0000000..a1a043a
--- /dev/null
+++ b/classes/UserConfig.php
@@ -0,0 +1,1304 @@
+<?php
+namespace StartupAPI;
+
+require_once(dirname(__DIR__) . '/php-bootstrap/bootstrap.php');
+require_once(dirname(__DIR__) . '/swiftmailer/lib/swift_required.php');
+
+/**
+ * This class contains a bunch of static variables defining how Startup API instance
+ * would behave with reasonable defaults that can be overriden in users_config.php
+ *
+ * @package StartupAPI
+ *
+ * @todo Move read-only arrays into appropriate classes and make them private
+ */
+class UserConfig {
+	/* ========================================================================
+	 *
+	 * Modules and extensions
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var StartupAPIModule[] List of all available modules (StartupAPIModule objects). Do not modify!
+	 */
+	public static $all_modules = array();
+
+	/**
+	 * List of authentication modules (AuthenticationModule objects). Do not modify!
+	 * Multiple authentication modules can be assigned for the same instance
+	 *
+	 * @var AuthenticationModule[]
+	 */
+	public static $authentication_modules = array();
+	// payment modules
+
+	/**
+	 * List of payment methods to be used for subscription. Do not modify!
+	 * Multiple payment modules can be enabled in the system, but only one can
+	 * be used by account at a time.
+	 *
+	 * Imitialize your like the following:
+	 * <code>
+	 * new ManualPaymentEngine();
+	 * </code>
+	 *
+	 * Only used when $useSubscriptions is set
+	 *
+	 * @var PaymentEngine[]
+	 */
+	public static $payment_modules = array();
+
+	/**
+	 * Email module responsible for syncronization with newsletter service. Only one can be assigned. Do not modify!
+	 *
+	 * @var EmailModule
+	 */
+	public static $email_module;
+
+
+	/* ========================================================================
+	 *
+	 * Debugging
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var boolean Enable / disable debug messages
+	 */
+	public static $DEBUG = false;
+
+	/**
+	 * @var boolean Show function arguments in debug messages
+	 */
+	public static $DEBUG_SHOW_ARGS = false;
+
+	/**
+	 * @var boolean Enable / disable developer tools in the UI
+	 */
+	public static $DEVMODE = false;
+
+	/* ========================================================================
+	 *
+	 * Paths and URLs
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var string Root path of the project on the file system
+	 */
+	public static $ROOTPATH;
+
+	/**
+	 * @var string Root URL of Startup API code (relative, e.g. /myapp/users/)
+	 */
+	public static $USERSROOTURL;
+
+	/**
+	 * @var string Root URL of Startup API code (full, e.g. http://example.com/myapp/users/)
+	 */
+	public static $USERSROOTFULLURL;
+
+	/**
+	 * @var string Root URL of the application using Startup API (relative, e.g. /myapp/)
+	 */
+	public static $SITEROOTURL;
+
+	/**
+	 * @var string Root URL of the application using Startup API (full, e.g. http://example.com/myapp/)
+	 */
+	public static $SITEROOTFULLURL;
+
+	/**
+	 * @var string Default location URL to return to upon login
+	 */
+	public static $DEFAULTLOGINRETURN;
+
+	/**
+	 * @var string Default location URL to return to upon logout
+	 */
+	public static $DEFAULTLOGOUTRETURN;
+
+	/**
+	 * @var string Default location URL to return to upon registration
+	 */
+	public static $DEFAULTREGISTERRETURN;
+
+	/**
+	 * @var string Default location URL to return to upon password reset (for username/password auth)
+	 */
+	public static $DEFAULTUPDATEPASSWORDRETURN;
+
+	/**
+	 * @var string Default location URL to return to upon successful email verification
+	 */
+	public static $DEFAULT_EMAIL_VERIFIED_RETURN;
+
+	/* ========================================================================
+	 *
+	 * Sessions and cookies
+	 *
+	 * All cookies are stored encrypted using a session secret
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var string Session secret - must be unique for each installation
+	 *
+	 * @todo Add some validation to ensure that this instance actually specified a unique secret
+	 */
+	public static $SESSION_SECRET;
+
+	/**
+	 * @var string Cookie name for csrf nonce storage
+	 */
+	public static $csrf_nonce_key = 'users-csrf-nonce';
+
+	/**
+	 * @var string Cookie name for User ID, indicates that user is logged in.
+	 */
+	public static $session_userid_key = 'users-userid';
+
+	/**
+	 * Cookie name for the URL to return to for redirect-based actions
+	 * like login, registration and etc.
+	 *
+	 * @var string
+	 */
+	public static $session_return_key = 'users-return-to';
+
+	/**
+	 * @var string Cookie name for User ID of the user being impersonated
+	 */
+	public static $impersonation_userid_key = 'users-userid-impr';
+
+	/**
+	 * @var string Facebook session storage cookie name prefix
+	 */
+	public static $facebook_storage_key_prefix = 'users-fb';
+
+	/**
+	 * @var string Cookie name for OAuth User ID during the OAuth workflow
+	 */
+	public static $oauth_user_id_key = 'users-oauth-user-id';
+
+	/**
+	 * @var string Cookie name for storing referrer between anonymous user's arrival and their registration
+	 */
+	public static $entry_referer_key = 'users-ref';
+
+	/**
+	 * @var string Cookie name for storing campaign object between anonymous user's arrival and their registration
+	 */
+	public static $entry_cmp_key = 'users-cmp';
+
+	/**
+	 * @var string Cookie name for last login cookie
+	 */
+	public static $last_login_key = 'users-last-login';
+
+	/**
+	 * @var string Cookie name for storing invitation ID between registration start and user creation
+	 */
+	public static $invitation_code_key = 'users-invite-code';
+
+	/**
+	 * @var boolean Allow remembering a user beyond their browser session, true by default
+	 */
+	public static $allowRememberMe = true;
+
+	/**
+	 * @var boolean Automatically remember user  beyond their browser session when they register, true by default
+	 */
+	public static $rememberUserOnRegistration = true;
+
+	/**
+	 * Time in seconds for long sessions - defaults to 10 years, can be set to relatively short, e.g. 2 weeks if needed
+	 *
+	 * @var int
+	 */
+	public static $rememberMeTime = 315360000;
+
+	/**
+	 * @var boolean Checks "remember me" box on registration and login forms (false by default)
+	 */
+	public static $rememberMeDefault = false;
+
+	/* ========================================================================
+	 *
+	 * Admin UI and access
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * Array of integer IDs for site administrators (who have access to adin UI).
+	 *
+	 * Usually first user with ID of 1 is administrator, but defining it without
+	 * having this user in the system might be dangerous if IDs didnt generate
+	 * as you expected upon data re-import or something.
+	 *
+	 * @var array
+	 */
+	public static $admins = array();
+
+	/* ========================================================================
+	 *
+	 * DB cpnnectivity
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var string MySQL host
+	 */
+	public static $mysql_host = 'localhost';
+
+	/**
+	 * @var int MySQL port
+	 */
+	public static $mysql_port = 3306;
+
+	/**
+	 * MySQL socket path on file system. If specified, StartupAPI will not use TCP/IP,
+	 * but a socket connection instead.
+	 *
+	 * @var string
+	 */
+	public static $mysql_socket;
+
+	/**
+	 * @var string MySQL database name
+	 */
+	public static $mysql_db;
+
+	/**
+	 * @var string MySQL database user. See access permissions requirements at http://StartupAPI.org/StartupAPI/DB_privileges
+	 */
+	public static $mysql_user;
+
+	/**
+	 * @var string MySQL password
+	 */
+	public static $mysql_password;
+
+	/**
+	 * @var string MySQL table prefix for all StartupAPI tables ('u_' by default)
+	 *
+	 * @deprecated prefix is now hard-coded so there is no need to change it
+	 */
+	public static $mysql_prefix = 'u_';
+
+	/**
+	 * @var mysqli Database connection singleton
+	 */
+	private static $db = null;
+
+	/* ========================================================================
+	 *
+	 * Headers, footers and look and feel
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var string Application name
+	 */
+	public static $appName;
+
+	/**
+	 * @var string Application icon URL (20x20)
+	 */
+	public static $appIconURL;
+
+	/**
+	 * @var string File system path to header HTML file.
+	 * @deprecated since version 0.7
+	 */
+	public static $header;
+
+	/**
+	 * @var string File system path to footer HTML file.
+	 * @deprecated since version 0.7
+	 */
+	public static $footer;
+
+	/**
+	 * File system path to maillist management widget file to be included on profile management page.
+	 *
+	 * @var string
+	 */
+	public static $maillist;
+
+	/**
+	 * @var string File system path to admin UI header HTML file.
+	 * @deprecated since version 0.7
+	 */
+	public static $admin_header;
+
+	/**
+	 * @var string File system path to admin UI footer HTML file.
+	 * @deprecated since version 0.7
+	 */
+	public static $admin_footer;
+
+	/**
+	 * @var array[] Array of available theme slugs
+	 */
+	public static $available_themes = array('classic', 'awesome');
+
+	/**
+	 * @var string Theme slug for current theme
+	 */
+	public static $theme = 'awesome';
+
+	/**
+	 * @var string Folder with local theme overrides
+	 */
+	public static $theme_override = null;
+
+	/**
+	 * @var string[]|int[]|boolean[]|array[] Description
+	 */
+	public static $app_global_template_variables = array();
+
+	/**
+	 * @var string If specified, StartupAPI::head() will include this Twitter Bootstrap CSS instead of default one
+	 * @deprecated since 0.7 Now using Bootstrap 3 which has separate theme file, main bootstrap file is no longer modifiable
+	 */
+	public static $bootstrapCSS = null;
+
+	/**
+	 * @var string[] Bootstrap themes available
+	 */
+	public static $availableBootstrapThemes = array(
+		'cerulean',
+		'cosmo',
+		'cyborg',
+		'darkly',
+		'flatly',
+		'journal',
+		'lumen',
+		'paper',
+		'readable',
+		'sandstone',
+		'simplex',
+		'slate',
+		'spacelab',
+		'superhero',
+		'united',
+		'yeti'
+	);
+
+	/**
+	 * @var string If specified, StartupAPI::head() will include this Twitter Bootstrap Theme instead of default one
+	 */
+	public static $bootstrapTheme = null;
+
+	/**
+	 * @var string If specified, Admin UI will include this Twitter Bootstrap CSS instead of default one
+	 */
+	public static $bootstrapAdminCSS = null;
+
+	/**
+	 * @var array Associative array of Twig environment options
+	 */
+	public static $twig_options = array();
+
+	/**
+	 * @var boolean Put power strip in a navbar (disable if you have your own navbar going)
+	 */
+	public static $powerStripShowNavbar = true;
+
+	/**
+	 * @var boolean Invert power strip styles
+	 */
+	public static $powerStripInvertedNavbar = false;
+
+	/**
+	 * @var boolean Show power strip as Bootstrap nav pills instead of navbar
+	 */
+	public static $powerStripNavPills = false;
+
+	/**
+	 * @var boolean Align power strip to the right
+	 */
+	public static $powerStripPullRight = true;
+
+	/* ========================================================================
+	 *
+	 * Activity tracking and analytics
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var array An array of activity entries
+	 *
+	 * @todo Create Activity class and rewrite everything to use the class instead of params array
+	 */
+	public static $activities = array();
+
+	/**
+	 * @var boolean Only consider users active if they had activities with non-zero value points assigned
+	 */
+	public static $adminActiveOnlyWithPoints = false;
+
+	/**
+	 * @var StartupAPI\CohortAnalysis\CohortProvider[] An array of cohort providers (CohortProvider objects) for cohort analysis
+	 */
+	public static $cohort_providers = array();
+
+	// returning user activity configs
+
+	/**
+	 * @var int Number of minutes for considering a user as returning user, 30 minutes by default
+	 */
+	public static $last_login_session_length = 30;
+
+	/**
+	 * Array of arrays of URL parameters to be used for campaign tracking.
+	 * Google Analytics (Urchin) defaults are pre-configured, you can append your keys.
+	 *
+	 * The following keys are used:
+	 * - cmp_source - campaign source ('utm_source' is tracked by default)
+	 * - cmp_medium - campaign medium ('utm_medium' is tracked by default)
+	 * - cmp_keywords - campaign keyworkds ('utm_term' is tracked by default)
+	 * - cmp_content - campaign content ('utm_content' is tracked by default)
+	 * - cmp_name - campaign name ('utm_campaign' is tracked by default)
+	 *
+	 * @var array
+	 */
+	public static $campaign_variables = array(
+		'cmp_source' => array('utm_source'),
+		'cmp_medium' => array('utm_medium'),
+		'cmp_keywords' => array('utm_term'),
+		'cmp_content' => array('utm_content'),
+		'cmp_name' => array('utm_campaign')
+	);
+
+	/**
+	 * Array of match => replacement pairs for rewriting referrers in referrer report in admin UI
+	 *
+	 * @var array
+	 */
+	public static $refererRegexes = array();
+
+	/**
+	 * An array of user IDs to exclude from activity listing in admin UI.
+	 * Try not to use it unless absolutely necessary - transparency is very important for operations.
+	 *
+	 * @var int[]
+	 */
+	public static $dont_display_activity_for = array();
+
+
+	/* ========================================================================
+	 *
+	 * Gamification
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var boolean If set to true, enables gamification features
+	 */
+	public static $enableGamification = false;
+
+	/**
+	 * @var int Size of badge images on the badge listing pages
+	 */
+	public static $badgeListingSize = 100;
+
+	/**
+	 * @var int Size of the badge image on badge page
+	 */
+	public static $badgeLargeSize = 300;
+
+
+	/* ========================================================================
+	 *
+	 * Systems features
+	 *
+	 * ===================================================================== */
+
+	/**
+	 *
+	 * [DEPRECATED] A list of features in the system.
+	 *
+	 * This way of defining features is deprecated, use Feature class instead.
+	 *
+	 * Key must be a unique integer, usually defined as a constant
+	 *
+	 * Values of the array are arrays with following elements:
+	 * [0] name of the feature (string)
+	 * [1] if feature is enabled or disabled globally (boolean)
+	 * [2] if featurei s enabled for everybody, overriding account settings (boolean)
+	 *
+	 * @var array
+	 *
+	 * @deprecated
+	 */
+	public static $features = array();
+
+
+	/* ========================================================================
+	 *
+	 * Startup API functionality switches
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var boolean Set to false to disable registration of new users
+	 */
+	public static $enableRegistration = true;
+
+	/**
+	 * @var string Disabled registration message, e.g. "Registration is disabled." (default) or "Coming soon"
+	 */
+	public static $registrationDisabledMessage = 'Registration is disabled.';
+
+	/**
+	 * @var boolean Invitation from administrator required for registration
+	 */
+	public static $adminInvitationOnly = false;
+
+	/**
+	 * @var boolean Deprecated config option, replaced with UserConfig::$adminInvitationOnly
+	 * @deprecated since version 0.5.1
+	 */
+	public static $enableInvitations = null;
+
+	/**
+	 * @var string Message to be displayed on registration page if person came without an invitation
+	 */
+	public static $invitationRequiredMessage = 'Please enter your invitation code';
+
+	/**
+	 * @var boolean Enables user invitations
+	 */
+	public static $enableUserInvitations = true;
+
+	/**
+	 * @var string Invitation menu/section title
+	 */
+	public static $userInvitationSectionTitle = 'Invite Friends';
+
+	/**
+	 * @var string URL of Terms of Service Document
+	 */
+	public static $termsOfServiceURL;
+
+	/**
+	 * @var string Absolute URL of Terms of Service Document (used in emails and such)
+	 */
+	public static $termsOfServiceFullURL;
+
+	/**
+	 * @var string URL of Privacy Policy Document
+	 */
+	public static $privacyPolicyURL;
+
+	/**
+	 * @var string Absolute URL of Privacy Policy Document (used in emails and such)
+	 */
+	public static $privacyPolicyFullURL;
+
+	/**
+	 * Version of the Terms Of Service Document users consent to when signing up,
+	 * increment it when you change TOS document contents
+	 *
+	 * @var int
+	 */
+	public static $currentTOSVersion;
+
+
+	/* ========================================================================
+	 *
+	 * System emails settings
+	 *
+	 * ===================================================================== */
+
+   /**
+    * @var \Swift_Mailer Transactional mailer object
+    */
+	public static $mailer;
+
+	/**
+	 * @var string Name and email to send invitations from (e.g. 'User Support <support@example.com>')
+	 * @deprecated
+	 */
+	public static $supportEmailFrom = 'User Support <support@example.com>';
+
+	/**
+	 * Name to send invitations from (e.g. 'User Support')
+	 * @var string
+	 */
+	public static $supportEmailFromName = 'User Support';
+
+	/**
+	 * Email to send invitations from (e.g. 'support@example.com')
+	 * @var string
+	 */
+	public static $supportEmailFromEmail = 'support@example.com';
+
+	/**
+	 * @var string Reply-To email address for return emails
+	 */
+	public static $supportEmailReplyTo = 'support@example.com';
+
+	/**
+	 * @var string Email agent header (X-Mailer), 'Startup API (PHP/'.phpversion().')' by default.
+	 * '
+	 * @todo Figure out if there are best practices to be applied here,
+	 * e.g. administrator's email address or backlink to the site, etc.
+	 */
+	public static $supportEmailXMailer;
+
+	/**
+	 * @var string Password recovery email subject line
+	 */
+	public static $passwordRecoveryEmailSubject = 'Your Password';
+
+	/**
+	 * @var string Email verification message subject line
+	 */
+	public static $emailVerificationSubject = 'Please verify your email';
+
+	/**
+	 * Set to true if you want to require users to verify their email addresses
+	 * before they can log in.
+	 *
+	 * @var boolean
+	 */
+	public static $requireVerifiedEmail = false;
+
+	/**
+	 * @var int Amount of days email verification code is valid for
+	 */
+	public static $emailVerificationCodeExpiresInDays = 5;
+
+	/**
+	 * Bypasses required email verificatiob flag if set to true
+	 *
+	 * THIS SHOULD ONLY BE SET ON EMAIL VERIFICATION PAGE
+	 * SETTING THIS ON OTHER PAGES CAN RESULT IN SECURITY BREACH
+	 *
+	 * @var boolean
+	 *
+	 * @internal
+	 */
+	public static $IGNORE_REQUIRED_EMAIL_VERIFICATION = false;
+
+
+	/* ========================================================================
+	 *
+	 * Accounts
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * Use accounts in addition to users, disable this only if youare not going to
+	 * charge subscription fees and 100% sure that you will never have multiple
+	 * users using same data in your system.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated
+	 */
+	public static $useAccounts = true;
+
+	/**
+	 * @var string Destination URL used when account is switched (current page by default, if null)
+	 */
+	public static $accountSwitchDestination = null;
+
+	/**
+	 * Creates personal accounts even if user was invited to a group account when registered
+	 *
+	 * @var boolean
+	 */
+	public static $createPersonalAccountsIfInvitedToGroupAccount = false;
+
+	/**
+	 * Bypasses required account plan verification flag if set to true
+	 *
+	 * THIS SHOULD ONLY BE SET ON PLAN SELECTION PAGESS
+	 * SETTING THIS ON OTHER PAGES CAN RESULT IN PRIVILEGE ESCALATION
+	 *
+	 * @var boolean
+	 *
+	 * @internal
+	 */
+	public static $IGNORE_CURRENT_ACCOUNT_PLAN_VERIFICATION = false;
+
+
+	/* ========================================================================
+	 *
+	 * OAuth client configuration
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var string OAuth application name, not sent if null (default) - apps use registered name most of the time anyway
+	 */
+	public static $OAuthAppName = null;
+
+
+	/* ========================================================================
+	 *
+	 * Hooks
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var callable Hook for rendering invitation action UI in admin interface
+	 */
+	public static $onRenderUserInvitationAction = '\StartupAPI\UserConfig::renderUserInvitationAction';
+
+	/**
+	 * @var callable Hook for rendering invitation followup action UI in admin interface
+	 */
+	public static $onRenderUserInvitationFollowUpAction = '\StartupAPI\UserConfig::renderUserInvitationFollowUpAction';
+
+	/**
+	 * @var callable Formatter for password recovery email
+	 */
+	public static $onRenderTemporaryPasswordEmail = '\StartupAPI\UserConfig::renderTemporaryPasswordEmail';
+
+	/**
+	 * @var callable Formatter for user invitation message placeholder
+	 */
+	public static $onRenderUserInvitationMessagePlaceholder = '\StartupAPI\UserConfig::renderUserInvitationMessagePlaceholder';
+
+	/**
+	 * @var callable Formatter for email verification message
+	 */
+	public static $onRenderVerificationCodeEmail = '\StartupAPI\UserConfig::renderVerificationCodeEmail';
+
+	/**
+	 * @var callable Formatter for user-to-user invitation email message
+	 */
+	public static $onRenderInvitationEmailMessage = '\StartupAPI\UserConfig::renderInvitationEmailMessage';
+
+	/**
+	 * @var callable Formatter for user-to-user invitation email subject
+	 */
+	public static $onRenderInvitationEmailSubject = '\StartupAPI\UserConfig::renderInvitationEmailSubject';
+
+	/**
+	 * @var callable Handler to be called when new user is created, newly created user object is passed in
+	 */
+	public static $onCreate = null;
+
+	/**
+	 * @var callable Hook for rendering extra links on power strip
+	 */
+	public static $onLoginStripLinks = null;
+
+	/**
+	 * @var callable Hook for rendering Terms of Service and Privacy Policy verbiage on signup forms
+	 */
+	public static $onRenderTOSLinks = '\StartupAPI\UserConfig::renderTOSLinks';
+
+
+	/* ========================================================================
+	 *
+	 * Subscription data
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * Enables subscription plans and payments management
+	 *
+	 * Only works when $useAccounts is set (default)
+	 *
+	 * @var boolean
+	 */
+	public static $useSubscriptions = false;
+
+	/**
+	 * Free plan slug which is set to the user when they register without payment
+	 *
+	 * @var string Free plan slug
+	 */
+	public static $plan_free = 'PLAN_FREE';
+
+	/**
+	 * Plan configuration array with plan slugs as keys and config parameters as details
+	 *
+	 * This array must contain plan configuration for the plan defined in UserConfig::$plan_free
+	 *
+	 * <code>
+	 * UserConfig::$PLANS = array(
+	 * 	'PLAN_FREE' => array(
+	 * 			'id' => 0,
+	 * 			'name' => 'Free account',
+	 * 			'description' => 'Free access with basic functionality',
+	 * 			'capabilities' => array(
+	 * 				'individual' => true
+	 * 			)
+	 * 	)
+	 * );
+	 * </code>
+	 *
+	 * @var array
+	 */
+	public static $PLANS = array(
+		'PLAN_FREE' => array(
+			'id' => 0,
+			'name' => 'Free account',
+			'description' => 'Free access with basic functionality',
+			'capabilities' => array(
+				'individual' => true
+			)
+		)
+	);
+
+	/**
+	 * The slug of the plan that gets assigned to the user by default
+	 *
+	 * @var string
+	 */
+	public static $default_plan_slug = 'PLAN_FREE';
+
+	/**
+	 * The slug of the payment schedule that gets assigned to the user by default
+	 *
+	 * @var string
+	 */
+	public static $default_schedule_slug = 'default';
+
+	/* ========================================================================
+	 *
+	 * API - related configurations
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * @var boolean Exposed core StartupAPI methods in API (true by default)
+	 */
+	public static $enable_startupapi_apis = true;
+
+	/* ========================================================================
+	 *
+	 * Some global functions and default hooks, as well as static initializer
+	 *
+	 * ===================================================================== */
+
+	/**
+	 * Singleton call for getting database connection object
+	 *
+	 * Creates new connection if none made yet or uses existing connection aleady opened previously.
+	 *
+	 * Example:
+	 * <code>
+	 * $db = UserConfig::getDB();
+	 * </code>
+	 *
+	 * @return mysqli
+	 *
+	 * @throws Exceptions\DBException
+	 */
+	public static function getDB() {
+		if (is_null(self::$db)) {
+			self::$db = new mysqli(self::$mysql_host, self::$mysql_user, self::$mysql_password, self::$mysql_db, self::$mysql_port, self::$mysql_socket);
+			if (is_null(self::$db) || self::$db->connect_error) {
+				throw new Exceptions\DBException(self::$db, null, "Couldn't connect to database");
+			}
+
+			if (!self::$db->set_charset('utf8')) {
+				error_log("[Startup API] Warning: Can't set utf8 charset for DB connection");
+			}
+		}
+
+		return self::$db;
+	}
+
+	/**
+	 * Sets database connection object (mysqli)
+	 *
+	 * Can be used in users_config.php instead of defining connection parameters,
+	 * useful when your app is using same connection which is configured elsewhere
+	 *
+	 * @param mysqli $db
+	 */
+	public static function setDB($db) {
+		self::$db = $db;
+	}
+
+	/**
+	 * Default handler for UserConfig::$onRenderTOSLinks hook
+	 */
+	public static function renderTOSLinks() {
+		?><p style="font-size: smaller">By signing up you agree to our <a target="_blank" href="<?php echo UserConfig::$termsOfServiceURL ?>">Terms of Service</a>
+			and that you have read our <a target="_blank" href="<?php echo UserConfig::$privacyPolicyURL ?>">Privacy Policy</a>.</p><?php
+	}
+
+	/**
+	 * Default handler for UserConfig::$onRenderUserInvitationAction hook
+	 *
+	 * @param Invitation $invitation Invitation object
+	 */
+	public static function renderUserInvitationAction(Invitation $invitation) {
+		?><a class="btn btn-info btn-mini" href="mailto:<?php echo UserTools::spaceencode($invitation->getSentToEmail()) ?>?Subject=Invitation&Body=<?php echo UserTools::spaceencode(UserConfig::$SITEROOTFULLURL . '/users/register.php?invite=' . urlencode($invitation->getCode())) ?>"><i class="icon-envelope icon-white"></i> Invite</a><?php
+	}
+
+	/**
+	 * Default handler for UserConfig::$onRenderUserInvitationFollowUpAction hook
+	 *
+	 * @param Invitation $invitation Invitation object
+	 */
+	public static function renderUserInvitationFollowUpAction(Invitation $invitation) {
+		?><a class="btn btn-warning btn-mini"href="mailto:<?php echo UserTools::spaceencode($invitation->getSentToEmail()) ?>?Subject=Re:%20Invitation&Body=<?php echo UserTools::spaceencode(UserConfig::$SITEROOTFULLURL . '/users/register.php?invite=' . urlencode($invitation->getCode())) ?>"><i class="icon-envelope icon-white"></i> Follow Up</a><?php
+	}
+
+	/**
+	 * Default formatter for a user invitation email message placeholder
+	 *
+	 * @param User $user User sending the invitation
+	 *
+	 * @return string
+	 */
+	public static function renderUserInvitationMessagePlaceholder(User $user) {
+		$app_name = UserConfig::$appName;
+		$user_name = $user->getName();
+
+		$message = <<<"END"
+I'd like to invite you to join me on $app_name.
+
+- $user_name
+END;
+		return trim($message);
+	}
+
+	/**
+	 * Default handler for UserConfig::$onrenderTemporaryPasswordEmail hook
+	 *
+	 * Create your own like this to override outgoing password recovery emails.
+	 *
+	 * The password sent is actually a password recovery token disguised as
+	 * temporary password to avoid user confusion with different form fields.
+	 *
+	 * This token has limited lifespan and gets reset on password update or upon
+	 * successful entry of previous (remembered) password.
+	 * It's probably the most secure thing you can do for sending
+	 * recovery tokens to the user by email.
+	 *
+	 * @param string $baseurl URL for login page
+	 * @param string $username User's login name
+	 * @param string $temppass One time password / password recovery token
+	 *
+	 * @return string Text email body
+	 */
+	public static function renderTemporaryPasswordEmail($baseurl, $username, $temppass) {
+		$message = <<<EOD
+You're receieving this email because somebody requested to reset password for your user account
+
+If it wasn't you, then just ignore this email - your current password will keep working fine.
+
+Otherwise, just go and log in using your temporary password:
+
+Login Page: $baseurl
+Username: $username
+Temporary Password: $temppass
+
+You will be asked to enter your new password before you will be able to continue.
+
+Temporary passwords only work for one day and will become invalid once you set your new password.
+
+
+--
+User Support
+EOD;
+		if (!is_null(UserConfig::$appName)) {
+			$message .= "\n" . UserConfig::$appName;
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Default handler for UserConfig::onRenderVerificationCodeEmail hook
+	 *
+	 * Create your own like this to override email verification message
+	 *
+	 * @param string $verification_link Verification link to be clicked be a user
+	 * @param string $code Verification code user can manually type in
+	 *
+	 * @return string Email messge to send
+	 */
+	public static function renderVerificationCodeEmail($verification_link, $code) {
+		$verify_email_url = UserConfig::$USERSROOTFULLURL . '/verify_email.php';
+
+		$message = <<<EOD
+Please verify your email address by clicking on this link:
+$verification_link
+
+Or just go to $verify_email_url and enter the code: $code
+
+--
+User Support
+EOD;
+		if (!is_null(UserConfig::$appName)) {
+			$message .= "\n" . UserConfig::$appName;
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Default renderer for invitation email message
+	 *
+	 * @param Invitation $invitation Invitation object
+	 *
+	 * @return string Invitation email message
+	 */
+	public static function renderInvitationEmailMessage(Invitation $invitation) {
+		$code = $invitation->getCode();
+
+		$registration_code_link = UserConfig::$USERSROOTFULLURL . '/register.php?invite=' . urlencode($code);
+
+		$app = self::$appName;
+		$issuer_name = $invitation->getIssuer()->getName();
+
+		$account = $invitation->getAccount();
+		$account_message = '';
+		if (!is_null($account)) {
+			$account_message = $account->getName() . ' on ';
+		}
+
+		$name = $invitation->getSentToName();
+		$invitation_welcome = '';
+		if ($name) {
+			$invitation_welcome = "Hi $name,\n";
+		}
+
+		$note = $invitation->getNote();
+		if (!empty($note)) {
+			$note = "\n---------------------------------------------------------------------------------------\n" .
+					trim($note) .
+					"\n---------------------------------------------------------------------------------------\n";
+		}
+
+		$message = <<<EOD
+$invitation_welcome
+$issuer_name invited you to join $account_message$app
+$note
+Just click this link to sign up
+$registration_code_link
+
+--
+$app Support
+EOD;
+		return $message;
+	}
+
+	/**
+	 * Creates a subject for invitation email
+	 *
+	 * @param Invitation $invitation Invitation object
+	 * @return string Invitation email subject
+	 */
+	public static function renderInvitationEmailSubject(Invitation $invitation) {
+		$app = self::$appName;
+		$issuer_name = $invitation->getIssuer()->getName();
+
+		$account_message = '';
+
+		/*
+		  if (!is_null($account)) {
+		  $account_message = $account->getName() . ' on ';
+		  }
+		 */
+
+		return "Invitation to $account_message$app from $issuer_name";
+	}
+
+	/**
+	 * Loads Startup API module by ID/folder name.
+	 *
+	 * @param string $modulename Module ID / folder name.
+	 *
+	 * @deprecated
+	 * @throws Exceptions\StartupAPIDeprecatedException
+	 */
+	public static function loadModule($modulename) {
+		throw new Exceptions\StartupAPIDeprecatedException('Module loading no longer needed, just instantiate the class');
+	}
+
+	/**
+	 * Initializing static variables *BEFORE* user overrides them.
+	 *
+	 * If any initialization needs to happen after user changes are done,
+	 * you have toput them into config.php
+	 */
+	public static function init() {
+		$users_env = \PHPBootstrap\bootstrap(__DIR__);
+		$site_env = \PHPBootstrap\bootstrap(dirname(__DIR__));
+
+		UserConfig::$ROOTPATH = $users_env['ROOT_FILESYSTEM_PATH'];
+		UserConfig::$USERSROOTURL = $users_env['ROOT_ABSOLUTE_URL_PATH'];
+
+		// we assume that package is extracted into the root of the site
+		UserConfig::$SITEROOTURL = $site_env['ROOT_ABSOLUTE_URL_PATH'] . '/';
+
+		UserConfig::$DEFAULTLOGINRETURN = UserConfig::$SITEROOTURL;
+		UserConfig::$DEFAULTLOGOUTRETURN = UserConfig::$SITEROOTURL;
+		UserConfig::$DEFAULTREGISTERRETURN = UserConfig::$SITEROOTURL;
+		UserConfig::$DEFAULTUPDATEPASSWORDRETURN = UserConfig::$SITEROOTURL;
+		UserConfig::$DEFAULT_EMAIL_VERIFIED_RETURN = UserConfig::$SITEROOTURL;
+
+		UserConfig::$SITEROOTFULLURL = $site_env['ROOT_FULL_URL'];
+		UserConfig::$USERSROOTFULLURL = $users_env['ROOT_FULL_URL'];
+
+		// Default locations for terms of service and privacy policy documents
+		UserConfig::$termsOfServiceURL = UserConfig::$SITEROOTURL . 'terms_of_service.php';
+		UserConfig::$termsOfServiceFullURL = UserConfig::$SITEROOTFULLURL . 'terms_of_service.php';
+		UserConfig::$privacyPolicyURL = UserConfig::$SITEROOTURL . 'privacy_policy.php';
+		UserConfig::$privacyPolicyFullURL = UserConfig::$SITEROOTFULLURL . 'privacy_policy.php';
+
+		UserConfig::$supportEmailXMailer = 'Startup API (PHP/' . phpversion() . ')';
+
+		// Instantiating email sending object
+		UserConfig::$mailer = \Swift_Mailer::newInstance(\Swift_MailTransport::newInstance());
+
+		// Built in activities
+
+		/**
+		 * Activity ID for login using username and password
+		 */
+		define('USERBASE_ACTIVITY_LOGIN_UPASS', 1000);
+		/**
+		 * Activity ID for login using Facebpok
+		 */
+		define('USERBASE_ACTIVITY_LOGIN_FB', 1001);
+		/**
+		 * Activity ID for login using Google Friend Connect (deprecated)
+		 *
+		 * @deprecated
+		 */
+		define('USERBASE_ACTIVITY_LOGIN_GFC', 1002);
+
+		/**
+		 * Activity ID for adding username and password in user settings
+		 */
+		define('USERBASE_ACTIVITY_ADDED_UPASS', 1003);
+		/**
+		 * Activity ID for adding Facebook account in user settings
+		 */
+		define('USERBASE_ACTIVITY_ADDED_FB', 1004);
+		/**
+		 * Activity ID for adding Google Friend Connect account in user settings (deprecated)
+		 *
+		 * @deprecated
+		 */
+		define('USERBASE_ACTIVITY_ADDED_GFC', 1005);
+
+		/**
+		 * Activity ID for removing Facebook account in user settings
+		 */
+		define('USERBASE_ACTIVITY_REMOVED_FB', 1006);
+		/**
+		 * Activity ID for removing Google Friend Connect account in user settings (deprecated)
+		 *
+		 * @deprecated
+		 */
+		define('USERBASE_ACTIVITY_REMOVED_GFC', 1007);
+
+		/**
+		 * Activity ID for logging out of the application
+		 */
+		define('USERBASE_ACTIVITY_LOGOUT', 1008);
+
+		/**
+		 * Activity ID for registering using username and password
+		 */
+		define('USERBASE_ACTIVITY_REGISTER_UPASS', 1009);
+		/**
+		 * Activity ID for registering using Facebook account
+		 */
+		define('USERBASE_ACTIVITY_REGISTER_FB', 1010);
+		/**
+		 * Activity ID for registering using Google Friend Connect account (deprecated)
+		 *
+		 * @deprecated
+		 */
+		define('USERBASE_ACTIVITY_REGISTER_GFC', 1011);
+
+		/**
+		 * Activity ID for updating user information in user settings
+		 */
+		define('USERBASE_ACTIVITY_UPDATEUSERINFO', 1012);
+
+		/**
+		 * Activity ID for changing password
+		 */
+		define('USERBASE_ACTIVITY_UPDATEPASS', 1013);
+		/**
+		 * Activity ID for resetting forgotten password
+		 */
+		define('USERBASE_ACTIVITY_RESETPASS', 1014);
+
+		/**
+		 * Activity ID for returning back within a day
+		 */
+		define('USERBASE_ACTIVITY_RETURN_DAILY', 1015);
+		/**
+		 * Activity ID for returning back within a week
+		 */
+		define('USERBASE_ACTIVITY_RETURN_WEEKLY', 1016);
+		/**
+		 * Activity ID for returning back within a month
+		 */
+		define('USERBASE_ACTIVITY_RETURN_MONTHLY', 1017);
+
+		/**
+		 * Activity ID for logging in using email address
+		 */
+		define('USERBASE_ACTIVITY_LOGIN_EMAIL', 1018);
+		/**
+		 * Activity ID for registering using email address
+		 */
+		define('USERBASE_ACTIVITY_REGISTER_EMAIL', 1019);
+
+		// Array of activities in the system.
+		// Key must be integer (best if specified using a constant).
+		// The values are an array with label and "points" value of activity.
+		UserConfig::$activities = array(
+			USERBASE_ACTIVITY_LOGIN_UPASS => array('Logged in using username and password', 1),
+			USERBASE_ACTIVITY_LOGIN_FB => array('Logged in using Facebook', 1),
+			USERBASE_ACTIVITY_LOGIN_GFC => array('Logged in using Google Friend Connect', 1),
+			USERBASE_ACTIVITY_ADDED_UPASS => array('Added username and password', 1),
+			USERBASE_ACTIVITY_ADDED_FB => array('Added Facebook credential', 1),
+			USERBASE_ACTIVITY_ADDED_GFC => array('Added Google Friend Connect credential', 1),
+			USERBASE_ACTIVITY_REMOVED_FB => array('Removed Facebook Connect', 0),
+			USERBASE_ACTIVITY_REMOVED_GFC => array('Removed Google Friend Connect credential', 0),
+			USERBASE_ACTIVITY_LOGOUT => array('Logged out', 0),
+			USERBASE_ACTIVITY_REGISTER_UPASS => array('Registered using a form', 1),
+			USERBASE_ACTIVITY_REGISTER_FB => array('Registered using Facebook', 1),
+			USERBASE_ACTIVITY_REGISTER_GFC => array('Registered using Google Friend Connect', 1),
+			USERBASE_ACTIVITY_UPDATEUSERINFO => array('Updated user info', 0),
+			USERBASE_ACTIVITY_UPDATEPASS => array('Updated their password', 0),
+			USERBASE_ACTIVITY_RESETPASS => array('Reset forgotten password', 0),
+			USERBASE_ACTIVITY_RETURN_DAILY => array('Returned to the site within a day', 3),
+			USERBASE_ACTIVITY_RETURN_WEEKLY => array('Returned to the site within a week', 2),
+			USERBASE_ACTIVITY_RETURN_MONTHLY => array('Returned to the site within a month', 1),
+			USERBASE_ACTIVITY_LOGIN_EMAIL => array('Logged in using email link', 1),
+			USERBASE_ACTIVITY_REGISTER_EMAIL => array('Registered using email', 1)
+		);
+
+		UserConfig::$cohort_providers[] = new CohortAnalysis\GenerationCohorts(CohortAnalysis\GenerationCohorts::MONTH);
+		UserConfig::$cohort_providers[] = new CohortAnalysis\GenerationCohorts(CohortAnalysis\GenerationCohorts::WEEK);
+		UserConfig::$cohort_providers[] = new CohortAnalysis\GenerationCohorts(CohortAnalysis\GenerationCohorts::YEAR);
+		UserConfig::$cohort_providers[] = new CohortAnalysis\RegMethodCohorts();
+	}
+
+	/**
+	 * Old way of keeping track of modules.
+	 *
+	 * Couldn't reuse it, but keeping it here because it might be still populated in user configs
+	 * Use UserConfig::$all_modules array instead of needed
+	 *
+	 * @var array
+	 *
+	 * @deprecated
+	 */
+	public static $modules = array();
+
+}
diff --git a/classes/UserCredentials.php b/classes/UserCredentials.php
new file mode 100644
index 0000000..871a62e
--- /dev/null
+++ b/classes/UserCredentials.php
@@ -0,0 +1,20 @@
+<?php
+namespace StartupAPI;
+
+/**
+ * Class representing user credentials for particular module
+ * Must be subclassed and implemented by module
+ *
+ * @package StartupAPI
+ * @subpackage Authentication
+ */
+abstract class UserCredentials {
+
+	/**
+	 * This method should return HTML representation of user credentials to be included in admin interface
+	 * Usually linking to user's public profile at the source service
+	 *
+	 * @return string HTML representation of user credentials
+	 */
+	public abstract function getHTML();
+}
diff --git a/tools.php b/classes/UserTools.php
similarity index 99%
rename from tools.php
rename to classes/UserTools.php
index 07b8bd4..52be631 100644
--- a/tools.php
+++ b/classes/UserTools.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * Various tools used within Startup API
diff --git a/controller/account/account.php b/controller/account/account.php
index ad6aae2..5575e64 100644
--- a/controller/account/account.php
+++ b/controller/account/account.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(dirname(dirname(__DIR__)) . '/global.php');
 
 UserTools::preventCSRF();
diff --git a/controller/engine/choose_engine.php b/controller/engine/choose_engine.php
index 31e54da..51f0697 100644
--- a/controller/engine/choose_engine.php
+++ b/controller/engine/choose_engine.php
@@ -1,7 +1,7 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)) . '/global.php');
-require_once(dirname(dirname(__DIR__)) . '/classes/User.php');
 
 $user = User::require_login();
 $account = Account::getCurrentAccount($user);
diff --git a/cron.php b/cron.php
index 9e3d032..e091d5f 100644
--- a/cron.php
+++ b/cron.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/users.php');
 # Load all existing modules and check, if they have cronHandler method.
 
diff --git a/dbupgrade.php b/dbupgrade.php
index b0b0ece..767c10c 100644
--- a/dbupgrade.php
+++ b/dbupgrade.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /*
  * Copy this script to the folder above and populate $versions array with your migrations
  * For more info see: http://www.dbupgrade.org/Main_Page#Migrations_($versions_array)
@@ -851,7 +853,7 @@
 
 // creating DBUpgrade object with your database credentials and $versions defined above
 // using 'UserBase' namespace to make sure we don't conflict with parent project's dbupgrade
-$dbupgrade = new DBUpgrade(UserConfig::getDB(),	$versions, array(
+$dbupgrade = new \DBUpgrade(UserConfig::getDB(),	$versions, array(
 	'namespace' => 'UserBase',
 	'prefix' => 'u_'
 ));
diff --git a/default_config.php b/default_config.php
index 8d27514..5b15fc9 100644
--- a/default_config.php
+++ b/default_config.php
@@ -1,1320 +1,9 @@
 <?php
-/**
- * @package StartupAPI
- */
-require_once(__DIR__ . '/php-bootstrap/bootstrap.php');
-require_once(__DIR__ . '/classes/Plan.php');
-require_once(__DIR__ . '/classes/TransactionLogger.php');
-require_once(__DIR__ . '/classes/Cohort.php');
-require_once(__DIR__ . '/classes/Feature.php');
-require_once(__DIR__ . '/classes/Badge.php');
-require_once(__DIR__ . '/classes/StartupAPIModule.php');
-require_once(__DIR__ . '/tools.php');
-require_once(__DIR__ . '/swiftmailer/lib/swift_required.php');
+namespace StartupAPI;
 
 /**
- * This class contains a bunch of static variables defining how Startup API instance
- * would behave with reasonable defaults that can be overriden in users_config.php
- *
  * @package StartupAPI
- *
- * @todo Move read-only arrays into appropriate classes and make them private
  */
-class UserConfig {
-	/* ========================================================================
-	 *
-	 * Modules and extensions
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var StartupAPIModule[] List of all available modules (StartupAPIModule objects). Do not modify!
-	 */
-	public static $all_modules = array();
-
-	/**
-	 * List of authentication modules (AuthenticationModule objects). Do not modify!
-	 * Multiple authentication modules can be assigned for the same instance
-	 *
-	 * @var AuthenticationModule[]
-	 */
-	public static $authentication_modules = array();
-	// payment modules
-
-	/**
-	 * List of payment methods to be used for subscription. Do not modify!
-	 * Multiple payment modules can be enabled in the system, but only one can
-	 * be used by account at a time.
-	 *
-	 * Imitialize your like the following:
-	 * <code>
-	 * UserConfig::loadModule('manual');
-	 * new ManualPaymentEngine();
-	 * </code>
-	 *
-	 * Only used when $useSubscriptions is set
-	 *
-	 * @var PaymentEngine[]
-	 */
-	public static $payment_modules = array();
-
-	/**
-	 * Email module responsible for syncronization with newsletter service. Only one can be assigned. Do not modify!
-	 *
-	 * @var EmailModule
-	 */
-	public static $email_module;
-
-
-	/* ========================================================================
-	 *
-	 * Debugging
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var boolean Enable / disable debug messages
-	 */
-	public static $DEBUG = false;
-
-	/**
-	 * @var boolean Show function arguments in debug messages
-	 */
-	public static $DEBUG_SHOW_ARGS = false;
-
-	/**
-	 * @var boolean Enable / disable developer tools in the UI
-	 */
-	public static $DEVMODE = false;
-
-	/* ========================================================================
-	 *
-	 * Paths and URLs
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var string Root path of the project on the file system
-	 */
-	public static $ROOTPATH;
-
-	/**
-	 * @var string Root URL of Startup API code (relative, e.g. /myapp/users/)
-	 */
-	public static $USERSROOTURL;
-
-	/**
-	 * @var string Root URL of Startup API code (full, e.g. http://example.com/myapp/users/)
-	 */
-	public static $USERSROOTFULLURL;
-
-	/**
-	 * @var string Root URL of the application using Startup API (relative, e.g. /myapp/)
-	 */
-	public static $SITEROOTURL;
-
-	/**
-	 * @var string Root URL of the application using Startup API (full, e.g. http://example.com/myapp/)
-	 */
-	public static $SITEROOTFULLURL;
-
-	/**
-	 * @var string Default location URL to return to upon login
-	 */
-	public static $DEFAULTLOGINRETURN;
-
-	/**
-	 * @var string Default location URL to return to upon logout
-	 */
-	public static $DEFAULTLOGOUTRETURN;
-
-	/**
-	 * @var string Default location URL to return to upon registration
-	 */
-	public static $DEFAULTREGISTERRETURN;
-
-	/**
-	 * @var string Default location URL to return to upon password reset (for username/password auth)
-	 */
-	public static $DEFAULTUPDATEPASSWORDRETURN;
-
-	/**
-	 * @var string Default location URL to return to upon successful email verification
-	 */
-	public static $DEFAULT_EMAIL_VERIFIED_RETURN;
-
-	/* ========================================================================
-	 *
-	 * Sessions and cookies
-	 *
-	 * All cookies are stored encrypted using a session secret
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var string Session secret - must be unique for each installation
-	 *
-	 * @todo Add some validation to ensure that this instance actually specified a unique secret
-	 */
-	public static $SESSION_SECRET;
-
-	/**
-	 * @var string Cookie name for csrf nonce storage
-	 */
-	public static $csrf_nonce_key = 'users-csrf-nonce';
-
-	/**
-	 * @var string Cookie name for User ID, indicates that user is logged in.
-	 */
-	public static $session_userid_key = 'users-userid';
-
-	/**
-	 * Cookie name for the URL to return to for redirect-based actions
-	 * like login, registration and etc.
-	 *
-	 * @var string
-	 */
-	public static $session_return_key = 'users-return-to';
-
-	/**
-	 * @var string Cookie name for User ID of the user being impersonated
-	 */
-	public static $impersonation_userid_key = 'users-userid-impr';
-
-	/**
-	 * @var string Facebook session storage cookie name prefix
-	 */
-	public static $facebook_storage_key_prefix = 'users-fb';
-
-	/**
-	 * @var string Cookie name for OAuth User ID during the OAuth workflow
-	 */
-	public static $oauth_user_id_key = 'users-oauth-user-id';
-
-	/**
-	 * @var string Cookie name for storing referrer between anonymous user's arrival and their registration
-	 */
-	public static $entry_referer_key = 'users-ref';
-
-	/**
-	 * @var string Cookie name for storing campaign object between anonymous user's arrival and their registration
-	 */
-	public static $entry_cmp_key = 'users-cmp';
-
-	/**
-	 * @var string Cookie name for last login cookie
-	 */
-	public static $last_login_key = 'users-last-login';
-
-	/**
-	 * @var string Cookie name for storing invitation ID between registration start and user creation
-	 */
-	public static $invitation_code_key = 'users-invite-code';
-
-	/**
-	 * @var boolean Allow remembering a user beyond their browser session, true by default
-	 */
-	public static $allowRememberMe = true;
-
-	/**
-	 * @var boolean Automatically remember user  beyond their browser session when they register, true by default
-	 */
-	public static $rememberUserOnRegistration = true;
-
-	/**
-	 * Time in seconds for long sessions - defaults to 10 years, can be set to relatively short, e.g. 2 weeks if needed
-	 *
-	 * @var int
-	 */
-	public static $rememberMeTime = 315360000;
-
-	/**
-	 * @var boolean Checks "remember me" box on registration and login forms (false by default)
-	 */
-	public static $rememberMeDefault = false;
-
-	/* ========================================================================
-	 *
-	 * Admin UI and access
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * Array of integer IDs for site administrators (who have access to adin UI).
-	 *
-	 * Usually first user with ID of 1 is administrator, but defining it without
-	 * having this user in the system might be dangerous if IDs didnt generate
-	 * as you expected upon data re-import or something.
-	 *
-	 * @var array
-	 */
-	public static $admins = array();
-
-	/* ========================================================================
-	 *
-	 * DB cpnnectivity
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var string MySQL host
-	 */
-	public static $mysql_host = 'localhost';
-
-	/**
-	 * @var int MySQL port
-	 */
-	public static $mysql_port = 3306;
-
-	/**
-	 * MySQL socket path on file system. If specified, StartupAPI will not use TCP/IP,
-	 * but a socket connection instead.
-	 *
-	 * @var string
-	 */
-	public static $mysql_socket;
-
-	/**
-	 * @var string MySQL database name
-	 */
-	public static $mysql_db;
-
-	/**
-	 * @var string MySQL database user. See access permissions requirements at http://StartupAPI.org/StartupAPI/DB_privileges
-	 */
-	public static $mysql_user;
-
-	/**
-	 * @var string MySQL password
-	 */
-	public static $mysql_password;
-
-	/**
-	 * @var string MySQL table prefix for all StartupAPI tables ('u_' by default)
-	 *
-	 * @deprecated prefix is now hard-coded so there is no need to change it
-	 */
-	public static $mysql_prefix = 'u_';
-
-	/**
-	 * @var mysqli Database connection singleton
-	 */
-	private static $db = null;
-
-	/* ========================================================================
-	 *
-	 * Headers, footers and look and feel
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var string Application name
-	 */
-	public static $appName;
-
-	/**
-	 * @var string Application icon URL (20x20)
-	 */
-	public static $appIconURL;
-
-	/**
-	 * @var string File system path to header HTML file.
-	 * @deprecated since version 0.7
-	 */
-	public static $header;
-
-	/**
-	 * @var string File system path to footer HTML file.
-	 * @deprecated since version 0.7
-	 */
-	public static $footer;
-
-	/**
-	 * File system path to maillist management widget file to be included on profile management page.
-	 *
-	 * @var string
-	 */
-	public static $maillist;
-
-	/**
-	 * @var string File system path to admin UI header HTML file.
-	 * @deprecated since version 0.7
-	 */
-	public static $admin_header;
-
-	/**
-	 * @var string File system path to admin UI footer HTML file.
-	 * @deprecated since version 0.7
-	 */
-	public static $admin_footer;
-
-	/**
-	 * @var array[] Array of available theme slugs
-	 */
-	public static $available_themes = array('classic', 'awesome');
-
-	/**
-	 * @var string Theme slug for current theme
-	 */
-	public static $theme = 'awesome';
-
-	/**
-	 * @var string Folder with local theme overrides
-	 */
-	public static $theme_override = null;
-
-	/**
-	 * @var string[]|int[]|boolean[]|array[] Description
-	 */
-	public static $app_global_template_variables = array();
-
-	/**
-	 * @var string If specified, StartupAPI::head() will include this Twitter Bootstrap CSS instead of default one
-	 * @deprecated since 0.7 Now using Bootstrap 3 which has separate theme file, main bootstrap file is no longer modifiable
-	 */
-	public static $bootstrapCSS = null;
-
-	/**
-	 * @var string[] Bootstrap themes available
-	 */
-	public static $availableBootstrapThemes = array(
-		'cerulean',
-		'cosmo',
-		'cyborg',
-		'darkly',
-		'flatly',
-		'journal',
-		'lumen',
-		'paper',
-		'readable',
-		'sandstone',
-		'simplex',
-		'slate',
-		'spacelab',
-		'superhero',
-		'united',
-		'yeti'
-	);
-
-	/**
-	 * @var string If specified, StartupAPI::head() will include this Twitter Bootstrap Theme instead of default one
-	 */
-	public static $bootstrapTheme = null;
-
-	/**
-	 * @var string If specified, Admin UI will include this Twitter Bootstrap CSS instead of default one
-	 */
-	public static $bootstrapAdminCSS = null;
-
-	/**
-	 * @var array Associative array of Twig environment options
-	 */
-	public static $twig_options = array();
-
-	/**
-	 * @var boolean Put power strip in a navbar (disable if you have your own navbar going)
-	 */
-	public static $powerStripShowNavbar = true;
-
-	/**
-	 * @var boolean Invert power strip styles
-	 */
-	public static $powerStripInvertedNavbar = false;
-
-	/**
-	 * @var boolean Show power strip as Bootstrap nav pills instead of navbar
-	 */
-	public static $powerStripNavPills = false;
-
-	/**
-	 * @var boolean Align power strip to the right
-	 */
-	public static $powerStripPullRight = true;
-
-	/* ========================================================================
-	 *
-	 * Activity tracking and analytics
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var array An array of activity entries
-	 *
-	 * @todo Create Activity class and rewrite everything to use the class instead of params array
-	 */
-	public static $activities = array();
-
-	/**
-	 * @var boolean Only consider users active if they had activities with non-zero value points assigned
-	 */
-	public static $adminActiveOnlyWithPoints = false;
-
-	/**
-	 * @var CohortProvider[] An array of cohort providers (CohortProvider objects) for cohort analysis
-	 */
-	public static $cohort_providers = array();
-
-	// returning user activity configs
-
-	/**
-	 * @var int Number of minutes for considering a user as returning user, 30 minutes by default
-	 */
-	public static $last_login_session_length = 30;
-
-	/**
-	 * Array of arrays of URL parameters to be used for campaign tracking.
-	 * Google Analytics (Urchin) defaults are pre-configured, you can append your keys.
-	 *
-	 * The following keys are used:
-	 * - cmp_source - campaign source ('utm_source' is tracked by default)
-	 * - cmp_medium - campaign medium ('utm_medium' is tracked by default)
-	 * - cmp_keywords - campaign keyworkds ('utm_term' is tracked by default)
-	 * - cmp_content - campaign content ('utm_content' is tracked by default)
-	 * - cmp_name - campaign name ('utm_campaign' is tracked by default)
-	 *
-	 * @var array
-	 */
-	public static $campaign_variables = array(
-		'cmp_source' => array('utm_source'),
-		'cmp_medium' => array('utm_medium'),
-		'cmp_keywords' => array('utm_term'),
-		'cmp_content' => array('utm_content'),
-		'cmp_name' => array('utm_campaign')
-	);
-
-	/**
-	 * Array of match => replacement pairs for rewriting referrers in referrer report in admin UI
-	 *
-	 * @var array
-	 */
-	public static $refererRegexes = array();
-
-	/**
-	 * An array of user IDs to exclude from activity listing in admin UI.
-	 * Try not to use it unless absolutely necessary - transparency is very important for operations.
-	 *
-	 * @var int[]
-	 */
-	public static $dont_display_activity_for = array();
-
-
-	/* ========================================================================
-	 *
-	 * Gamification
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var boolean If set to true, enables gamification features
-	 */
-	public static $enableGamification = false;
-
-	/**
-	 * @var int Size of badge images on the badge listing pages
-	 */
-	public static $badgeListingSize = 100;
-
-	/**
-	 * @var int Size of the badge image on badge page
-	 */
-	public static $badgeLargeSize = 300;
-
-
-	/* ========================================================================
-	 *
-	 * Systems features
-	 *
-	 * ===================================================================== */
-
-	/**
-	 *
-	 * [DEPRECATED] A list of features in the system.
-	 *
-	 * This way of defining features is deprecated, use Feature class instead.
-	 *
-	 * Key must be a unique integer, usually defined as a constant
-	 *
-	 * Values of the array are arrays with following elements:
-	 * [0] name of the feature (string)
-	 * [1] if feature is enabled or disabled globally (boolean)
-	 * [2] if featurei s enabled for everybody, overriding account settings (boolean)
-	 *
-	 * @var array
-	 *
-	 * @deprecated
-	 */
-	public static $features = array();
-
-
-	/* ========================================================================
-	 *
-	 * Startup API functionality switches
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var boolean Set to false to disable registration of new users
-	 */
-	public static $enableRegistration = true;
-
-	/**
-	 * @var string Disabled registration message, e.g. "Registration is disabled." (default) or "Coming soon"
-	 */
-	public static $registrationDisabledMessage = 'Registration is disabled.';
-
-	/**
-	 * @var boolean Invitation from administrator required for registration
-	 */
-	public static $adminInvitationOnly = false;
-
-	/**
-	 * @var boolean Deprecated config option, replaced with UserConfig::$adminInvitationOnly
-	 * @deprecated since version 0.5.1
-	 */
-	public static $enableInvitations = null;
-
-	/**
-	 * @var string Message to be displayed on registration page if person came without an invitation
-	 */
-	public static $invitationRequiredMessage = 'Please enter your invitation code';
-
-	/**
-	 * @var boolean Enables user invitations
-	 */
-	public static $enableUserInvitations = true;
-
-	/**
-	 * @var string Invitation menu/section title
-	 */
-	public static $userInvitationSectionTitle = 'Invite Friends';
-
-	/**
-	 * @var string URL of Terms of Service Document
-	 */
-	public static $termsOfServiceURL;
-
-	/**
-	 * @var string Absolute URL of Terms of Service Document (used in emails and such)
-	 */
-	public static $termsOfServiceFullURL;
-
-	/**
-	 * @var string URL of Privacy Policy Document
-	 */
-	public static $privacyPolicyURL;
-
-	/**
-	 * @var string Absolute URL of Privacy Policy Document (used in emails and such)
-	 */
-	public static $privacyPolicyFullURL;
-
-	/**
-	 * Version of the Terms Of Service Document users consent to when signing up,
-	 * increment it when you change TOS document contents
-	 *
-	 * @var int
-	 */
-	public static $currentTOSVersion;
-
-
-	/* ========================================================================
-	 *
-	 * System emails settings
-	 *
-	 * ===================================================================== */
-
-   /**
-    * @var Swift_Mailer Transactional mailer object
-    */
-	public static $mailer;
-
-	/**
-	 * @var string Name and email to send invitations from (e.g. 'User Support <support@example.com>')
-	 * @deprecated
-	 */
-	public static $supportEmailFrom = 'User Support <support@example.com>';
-
-	/**
-	 * Name to send invitations from (e.g. 'User Support')
-	 * @var string
-	 */
-	public static $supportEmailFromName = 'User Support';
-
-	/**
-	 * Email to send invitations from (e.g. 'support@example.com')
-	 * @var string
-	 */
-	public static $supportEmailFromEmail = 'support@example.com';
-
-	/**
-	 * @var string Reply-To email address for return emails
-	 */
-	public static $supportEmailReplyTo = 'support@example.com';
-
-	/**
-	 * @var string Email agent header (X-Mailer), 'Startup API (PHP/'.phpversion().')' by default.
-	 * '
-	 * @todo Figure out if there are best practices to be applied here,
-	 * e.g. administrator's email address or backlink to the site, etc.
-	 */
-	public static $supportEmailXMailer;
-
-	/**
-	 * @var string Password recovery email subject line
-	 */
-	public static $passwordRecoveryEmailSubject = 'Your Password';
-
-	/**
-	 * @var string Email verification message subject line
-	 */
-	public static $emailVerificationSubject = 'Please verify your email';
-
-	/**
-	 * Set to true if you want to require users to verify their email addresses
-	 * before they can log in.
-	 *
-	 * @var boolean
-	 */
-	public static $requireVerifiedEmail = false;
-
-	/**
-	 * @var int Amount of days email verification code is valid for
-	 */
-	public static $emailVerificationCodeExpiresInDays = 5;
-
-	/**
-	 * Bypasses required email verificatiob flag if set to true
-	 *
-	 * THIS SHOULD ONLY BE SET ON EMAIL VERIFICATION PAGE
-	 * SETTING THIS ON OTHER PAGES CAN RESULT IN SECURITY BREACH
-	 *
-	 * @var boolean
-	 *
-	 * @internal
-	 */
-	public static $IGNORE_REQUIRED_EMAIL_VERIFICATION = false;
-
-
-	/* ========================================================================
-	 *
-	 * Accounts
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * Use accounts in addition to users, disable this only if youare not going to
-	 * charge subscription fees and 100% sure that you will never have multiple
-	 * users using same data in your system.
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated
-	 */
-	public static $useAccounts = true;
-
-	/**
-	 * @var string Destination URL used when account is switched (current page by default, if null)
-	 */
-	public static $accountSwitchDestination = null;
-
-	/**
-	 * Creates personal accounts even if user was invited to a group account when registered
-	 *
-	 * @var boolean
-	 */
-	public static $createPersonalAccountsIfInvitedToGroupAccount = false;
-
-	/**
-	 * Bypasses required account plan verification flag if set to true
-	 *
-	 * THIS SHOULD ONLY BE SET ON PLAN SELECTION PAGESS
-	 * SETTING THIS ON OTHER PAGES CAN RESULT IN PRIVILEGE ESCALATION
-	 *
-	 * @var boolean
-	 *
-	 * @internal
-	 */
-	public static $IGNORE_CURRENT_ACCOUNT_PLAN_VERIFICATION = false;
-
-
-	/* ========================================================================
-	 *
-	 * OAuth client configuration
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var string OAuth application name, not sent if null (default) - apps use registered name most of the time anyway
-	 */
-	public static $OAuthAppName = null;
-
-
-	/* ========================================================================
-	 *
-	 * Hooks
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var callable Hook for rendering invitation action UI in admin interface
-	 */
-	public static $onRenderUserInvitationAction = 'UserConfig::renderUserInvitationAction';
-
-	/**
-	 * @var callable Hook for rendering invitation followup action UI in admin interface
-	 */
-	public static $onRenderUserInvitationFollowUpAction = 'UserConfig::renderUserInvitationFollowUpAction';
-
-	/**
-	 * @var callable Formatter for password recovery email
-	 */
-	public static $onRenderTemporaryPasswordEmail = 'UserConfig::renderTemporaryPasswordEmail';
-
-	/**
-	 * @var callable Formatter for user invitation message placeholder
-	 */
-	public static $onRenderUserInvitationMessagePlaceholder = 'UserConfig::renderUserInvitationMessagePlaceholder';
-
-	/**
-	 * @var callable Formatter for email verification message
-	 */
-	public static $onRenderVerificationCodeEmail = 'UserConfig::renderVerificationCodeEmail';
-
-	/**
-	 * @var callable Formatter for user-to-user invitation email message
-	 */
-	public static $onRenderInvitationEmailMessage = 'UserConfig::renderInvitationEmailMessage';
-
-	/**
-	 * @var callable Formatter for user-to-user invitation email subject
-	 */
-	public static $onRenderInvitationEmailSubject = 'UserConfig::renderInvitationEmailSubject';
-
-	/**
-	 * @var callable Handler to be called when new user is created, newly created user object is passed in
-	 */
-	public static $onCreate = null;
-
-	/**
-	 * @var callable Hook for rendering extra links on power strip
-	 */
-	public static $onLoginStripLinks = null;
-
-	/**
-	 * @var callable Hook for rendering Terms of Service and Privacy Policy verbiage on signup forms
-	 */
-	public static $onRenderTOSLinks = 'UserConfig::renderTOSLinks';
-
-
-	/* ========================================================================
-	 *
-	 * Subscription data
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * Enables subscription plans and payments management
-	 *
-	 * Only works when $useAccounts is set (default)
-	 *
-	 * @var boolean
-	 */
-	public static $useSubscriptions = false;
-
-	/**
-	 * Free plan slug which is set to the user when they register without payment
-	 *
-	 * @var string Free plan slug
-	 */
-	public static $plan_free = 'PLAN_FREE';
-
-	/**
-	 * Plan configuration array with plan slugs as keys and config parameters as details
-	 *
-	 * This array must contain plan configuration for the plan defined in UserConfig::$plan_free
-	 *
-	 * <code>
-	 * UserConfig::$PLANS = array(
-	 * 	'PLAN_FREE' => array(
-	 * 			'id' => 0,
-	 * 			'name' => 'Free account',
-	 * 			'description' => 'Free access with basic functionality',
-	 * 			'capabilities' => array(
-	 * 				'individual' => true
-	 * 			)
-	 * 	)
-	 * );
-	 * </code>
-	 *
-	 * @var array
-	 */
-	public static $PLANS = array(
-		'PLAN_FREE' => array(
-			'id' => 0,
-			'name' => 'Free account',
-			'description' => 'Free access with basic functionality',
-			'capabilities' => array(
-				'individual' => true
-			)
-		)
-	);
-
-	/**
-	 * The slug of the plan that gets assigned to the user by default
-	 *
-	 * @var string
-	 */
-	public static $default_plan_slug = 'PLAN_FREE';
-
-	/**
-	 * The slug of the payment schedule that gets assigned to the user by default
-	 *
-	 * @var string
-	 */
-	public static $default_schedule_slug = 'default';
-
-	/* ========================================================================
-	 *
-	 * API - related configurations
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * @var boolean Exposed core StartupAPI methods in API (true by default)
-	 */
-	public static $enable_startupapi_apis = true;
-
-	/* ========================================================================
-	 *
-	 * Some global functions and default hooks, as well as static initializer
-	 *
-	 * ===================================================================== */
-
-	/**
-	 * Singleton call for getting database connection object
-	 *
-	 * Creates new connection if none made yet or uses existing connection aleady opened previously.
-	 *
-	 * Example:
-	 * <code>
-	 * $db = UserConfig::getDB();
-	 * </code>
-	 *
-	 * @return mysqli
-	 *
-	 * @throws DBException
-	 */
-	public static function getDB() {
-		if (is_null(self::$db)) {
-			self::$db = new mysqli(self::$mysql_host, self::$mysql_user, self::$mysql_password, self::$mysql_db, self::$mysql_port, self::$mysql_socket);
-			if (is_null(self::$db) || self::$db->connect_error) {
-				throw new DBException(self::$db, null, "Couldn't connect to database");
-			}
-
-			if (!self::$db->set_charset('utf8')) {
-				error_log("[Startup API] Warning: Can't set utf8 charset for DB connection");
-			}
-		}
-
-		return self::$db;
-	}
-
-	/**
-	 * Sets database connection object (mysqli)
-	 *
-	 * Can be used in users_config.php instead of defining connection parameters,
-	 * useful when your app is using same connection which is configured elsewhere
-	 *
-	 * @param mysqli $db
-	 */
-	public static function setDB($db) {
-		self::$db = $db;
-	}
-
-	/**
-	 * Default handler for UserConfig::$onRenderTOSLinks hook
-	 */
-	public static function renderTOSLinks() {
-		?><p style="font-size: smaller">By signing up you agree to our <a target="_blank" href="<?php echo UserConfig::$termsOfServiceURL ?>">Terms of Service</a>
-			and that you have read our <a target="_blank" href="<?php echo UserConfig::$privacyPolicyURL ?>">Privacy Policy</a>.</p><?php
-	}
-
-	/**
-	 * Default handler for UserConfig::$onRenderUserInvitationAction hook
-	 *
-	 * @param Invitation $invitation Invitation object
-	 */
-	public static function renderUserInvitationAction(Invitation $invitation) {
-		?><a class="btn btn-info btn-mini" href="mailto:<?php echo UserTools::spaceencode($invitation->getSentToEmail()) ?>?Subject=Invitation&Body=<?php echo UserTools::spaceencode(UserConfig::$SITEROOTFULLURL . '/users/register.php?invite=' . urlencode($invitation->getCode())) ?>"><i class="icon-envelope icon-white"></i> Invite</a><?php
-	}
-
-	/**
-	 * Default handler for UserConfig::$onRenderUserInvitationFollowUpAction hook
-	 *
-	 * @param Invitation $invitation Invitation object
-	 */
-	public static function renderUserInvitationFollowUpAction(Invitation $invitation) {
-		?><a class="btn btn-warning btn-mini"href="mailto:<?php echo UserTools::spaceencode($invitation->getSentToEmail()) ?>?Subject=Re:%20Invitation&Body=<?php echo UserTools::spaceencode(UserConfig::$SITEROOTFULLURL . '/users/register.php?invite=' . urlencode($invitation->getCode())) ?>"><i class="icon-envelope icon-white"></i> Follow Up</a><?php
-	}
-
-	/**
-	 * Default formatter for a user invitation email message placeholder
-	 *
-	 * @param User $user User sending the invitation
-	 *
-	 * @return string
-	 */
-	public static function renderUserInvitationMessagePlaceholder(User $user) {
-		$app_name = UserConfig::$appName;
-		$user_name = $user->getName();
-
-		$message = <<<"END"
-I'd like to invite you to join me on $app_name.
-
-- $user_name
-END;
-		return trim($message);
-	}
-
-	/**
-	 * Default handler for UserConfig::$onrenderTemporaryPasswordEmail hook
-	 *
-	 * Create your own like this to override outgoing password recovery emails.
-	 *
-	 * The password sent is actually a password recovery token disguised as
-	 * temporary password to avoid user confusion with different form fields.
-	 *
-	 * This token has limited lifespan and gets reset on password update or upon
-	 * successful entry of previous (remembered) password.
-	 * It's probably the most secure thing you can do for sending
-	 * recovery tokens to the user by email.
-	 *
-	 * @param string $baseurl URL for login page
-	 * @param string $username User's login name
-	 * @param string $temppass One time password / password recovery token
-	 *
-	 * @return string Text email body
-	 */
-	public static function renderTemporaryPasswordEmail($baseurl, $username, $temppass) {
-		$message = <<<EOD
-You're receieving this email because somebody requested to reset password for your user account
-
-If it wasn't you, then just ignore this email - your current password will keep working fine.
-
-Otherwise, just go and log in using your temporary password:
-
-Login Page: $baseurl
-Username: $username
-Temporary Password: $temppass
-
-You will be asked to enter your new password before you will be able to continue.
-
-Temporary passwords only work for one day and will become invalid once you set your new password.
-
-
---
-User Support
-EOD;
-		if (!is_null(UserConfig::$appName)) {
-			$message .= "\n" . UserConfig::$appName;
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Default handler for UserConfig::onRenderVerificationCodeEmail hook
-	 *
-	 * Create your own like this to override email verification message
-	 *
-	 * @param string $verification_link Verification link to be clicked be a user
-	 * @param string $code Verification code user can manually type in
-	 *
-	 * @return string Email messge to send
-	 */
-	public static function renderVerificationCodeEmail($verification_link, $code) {
-		$verify_email_url = UserConfig::$USERSROOTFULLURL . '/verify_email.php';
-
-		$message = <<<EOD
-Please verify your email address by clicking on this link:
-$verification_link
-
-Or just go to $verify_email_url and enter the code: $code
-
---
-User Support
-EOD;
-		if (!is_null(UserConfig::$appName)) {
-			$message .= "\n" . UserConfig::$appName;
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Default renderer for invitation email message
-	 *
-	 * @param Invitation $invitation Invitation object
-	 *
-	 * @return string Invitation email message
-	 */
-	public static function renderInvitationEmailMessage(Invitation $invitation) {
-		$code = $invitation->getCode();
-
-		$registration_code_link = UserConfig::$USERSROOTFULLURL . '/register.php?invite=' . urlencode($code);
-
-		$app = self::$appName;
-		$issuer_name = $invitation->getIssuer()->getName();
-
-		$account = $invitation->getAccount();
-		$account_message = '';
-		if (!is_null($account)) {
-			$account_message = $account->getName() . ' on ';
-		}
-
-		$name = $invitation->getSentToName();
-		$invitation_welcome = '';
-		if ($name) {
-			$invitation_welcome = "Hi $name,\n";
-		}
-
-		$note = $invitation->getNote();
-		if (!empty($note)) {
-			$note = "\n---------------------------------------------------------------------------------------\n" .
-					trim($note) .
-					"\n---------------------------------------------------------------------------------------\n";
-		}
-
-		$message = <<<EOD
-$invitation_welcome
-$issuer_name invited you to join $account_message$app
-$note
-Just click this link to sign up
-$registration_code_link
-
---
-$app Support
-EOD;
-		return $message;
-	}
-
-	/**
-	 * Creates a subject for invitation email
-	 *
-	 * @param Invitation $invitation Invitation object
-	 * @return string Invitation email subject
-	 */
-	public static function renderInvitationEmailSubject(Invitation $invitation) {
-		$app = self::$appName;
-		$issuer_name = $invitation->getIssuer()->getName();
-
-		$account_message = '';
-
-		/*
-		  if (!is_null($account)) {
-		  $account_message = $account->getName() . ' on ';
-		  }
-		 */
-
-		return "Invitation to $account_message$app from $issuer_name";
-	}
-
-	/**
-	 * Loads Startup API module by ID/folder name.
-	 *
-	 * @param string $modulename Module ID / folder name.
-	 *
-	 * @throws StartupAPIException
-	 */
-	public static function loadModule($modulename) {
-		if (is_dir(__DIR__ . '/modules/' . $modulename)) {
-			require_once(__DIR__ . '/modules/' . $modulename . '/index.php');
-		} else {
-			throw new StartupAPIException('Module ' . $modulename . ' does not exist in ' . __DIR__ . '/modules/ folder');
-		}
-	}
-
-	/**
-	 * Initializing static variables *BEFORE* user overrides them.
-	 *
-	 * If any initialization needs to happen after user changes are done,
-	 * you have toput them into config.php
-	 */
-	public static function init() {
-		$users_env = PHPBootstrap\bootstrap(__FILE__);
-		$site_env = PHPBootstrap\bootstrap(__DIR__);
-
-		UserConfig::$ROOTPATH = $users_env['ROOT_FILESYSTEM_PATH'];
-		UserConfig::$USERSROOTURL = $users_env['ROOT_ABSOLUTE_URL_PATH'];
-
-		// we assume that package is extracted into the root of the site
-		UserConfig::$SITEROOTURL = $site_env['ROOT_ABSOLUTE_URL_PATH'] . '/';
-
-		UserConfig::$DEFAULTLOGINRETURN = UserConfig::$SITEROOTURL;
-		UserConfig::$DEFAULTLOGOUTRETURN = UserConfig::$SITEROOTURL;
-		UserConfig::$DEFAULTREGISTERRETURN = UserConfig::$SITEROOTURL;
-		UserConfig::$DEFAULTUPDATEPASSWORDRETURN = UserConfig::$SITEROOTURL;
-		UserConfig::$DEFAULT_EMAIL_VERIFIED_RETURN = UserConfig::$SITEROOTURL;
-
-		UserConfig::$SITEROOTFULLURL = $site_env['ROOT_FULL_URL'];
-		UserConfig::$USERSROOTFULLURL = $users_env['ROOT_FULL_URL'];
-
-		// Default locations for terms of service and privacy policy documents
-		UserConfig::$termsOfServiceURL = UserConfig::$SITEROOTURL . 'terms_of_service.php';
-		UserConfig::$termsOfServiceFullURL = UserConfig::$SITEROOTFULLURL . 'terms_of_service.php';
-		UserConfig::$privacyPolicyURL = UserConfig::$SITEROOTURL . 'privacy_policy.php';
-		UserConfig::$privacyPolicyFullURL = UserConfig::$SITEROOTFULLURL . 'privacy_policy.php';
-
-		UserConfig::$supportEmailXMailer = 'Startup API (PHP/' . phpversion() . ')';
-
-		// Instantiating email sending object
-		UserConfig::$mailer = Swift_Mailer::newInstance(Swift_MailTransport::newInstance());
-
-		// Built in activities
-
-		/**
-		 * Activity ID for login using username and password
-		 */
-		define('USERBASE_ACTIVITY_LOGIN_UPASS', 1000);
-		/**
-		 * Activity ID for login using Facebpok
-		 */
-		define('USERBASE_ACTIVITY_LOGIN_FB', 1001);
-		/**
-		 * Activity ID for login using Google Friend Connect (deprecated)
-		 *
-		 * @deprecated
-		 */
-		define('USERBASE_ACTIVITY_LOGIN_GFC', 1002);
-
-		/**
-		 * Activity ID for adding username and password in user settings
-		 */
-		define('USERBASE_ACTIVITY_ADDED_UPASS', 1003);
-		/**
-		 * Activity ID for adding Facebook account in user settings
-		 */
-		define('USERBASE_ACTIVITY_ADDED_FB', 1004);
-		/**
-		 * Activity ID for adding Google Friend Connect account in user settings (deprecated)
-		 *
-		 * @deprecated
-		 */
-		define('USERBASE_ACTIVITY_ADDED_GFC', 1005);
-
-		/**
-		 * Activity ID for removing Facebook account in user settings
-		 */
-		define('USERBASE_ACTIVITY_REMOVED_FB', 1006);
-		/**
-		 * Activity ID for removing Google Friend Connect account in user settings (deprecated)
-		 *
-		 * @deprecated
-		 */
-		define('USERBASE_ACTIVITY_REMOVED_GFC', 1007);
-
-		/**
-		 * Activity ID for logging out of the application
-		 */
-		define('USERBASE_ACTIVITY_LOGOUT', 1008);
-
-		/**
-		 * Activity ID for registering using username and password
-		 */
-		define('USERBASE_ACTIVITY_REGISTER_UPASS', 1009);
-		/**
-		 * Activity ID for registering using Facebook account
-		 */
-		define('USERBASE_ACTIVITY_REGISTER_FB', 1010);
-		/**
-		 * Activity ID for registering using Google Friend Connect account (deprecated)
-		 *
-		 * @deprecated
-		 */
-		define('USERBASE_ACTIVITY_REGISTER_GFC', 1011);
-
-		/**
-		 * Activity ID for updating user information in user settings
-		 */
-		define('USERBASE_ACTIVITY_UPDATEUSERINFO', 1012);
-
-		/**
-		 * Activity ID for changing password
-		 */
-		define('USERBASE_ACTIVITY_UPDATEPASS', 1013);
-		/**
-		 * Activity ID for resetting forgotten password
-		 */
-		define('USERBASE_ACTIVITY_RESETPASS', 1014);
-
-		/**
-		 * Activity ID for returning back within a day
-		 */
-		define('USERBASE_ACTIVITY_RETURN_DAILY', 1015);
-		/**
-		 * Activity ID for returning back within a week
-		 */
-		define('USERBASE_ACTIVITY_RETURN_WEEKLY', 1016);
-		/**
-		 * Activity ID for returning back within a month
-		 */
-		define('USERBASE_ACTIVITY_RETURN_MONTHLY', 1017);
-
-		/**
-		 * Activity ID for logging in using email address
-		 */
-		define('USERBASE_ACTIVITY_LOGIN_EMAIL', 1018);
-		/**
-		 * Activity ID for registering using email address
-		 */
-		define('USERBASE_ACTIVITY_REGISTER_EMAIL', 1019);
-
-		// Array of activities in the system.
-		// Key must be integer (best if specified using a constant).
-		// The values are an array with label and "points" value of activity.
-		UserConfig::$activities = array(
-			USERBASE_ACTIVITY_LOGIN_UPASS => array('Logged in using username and password', 1),
-			USERBASE_ACTIVITY_LOGIN_FB => array('Logged in using Facebook', 1),
-			USERBASE_ACTIVITY_LOGIN_GFC => array('Logged in using Google Friend Connect', 1),
-			USERBASE_ACTIVITY_ADDED_UPASS => array('Added username and password', 1),
-			USERBASE_ACTIVITY_ADDED_FB => array('Added Facebook credential', 1),
-			USERBASE_ACTIVITY_ADDED_GFC => array('Added Google Friend Connect credential', 1),
-			USERBASE_ACTIVITY_REMOVED_FB => array('Removed Facebook Connect', 0),
-			USERBASE_ACTIVITY_REMOVED_GFC => array('Removed Google Friend Connect credential', 0),
-			USERBASE_ACTIVITY_LOGOUT => array('Logged out', 0),
-			USERBASE_ACTIVITY_REGISTER_UPASS => array('Registered using a form', 1),
-			USERBASE_ACTIVITY_REGISTER_FB => array('Registered using Facebook', 1),
-			USERBASE_ACTIVITY_REGISTER_GFC => array('Registered using Google Friend Connect', 1),
-			USERBASE_ACTIVITY_UPDATEUSERINFO => array('Updated user info', 0),
-			USERBASE_ACTIVITY_UPDATEPASS => array('Updated their password', 0),
-			USERBASE_ACTIVITY_RESETPASS => array('Reset forgotten password', 0),
-			USERBASE_ACTIVITY_RETURN_DAILY => array('Returned to the site within a day', 3),
-			USERBASE_ACTIVITY_RETURN_WEEKLY => array('Returned to the site within a week', 2),
-			USERBASE_ACTIVITY_RETURN_MONTHLY => array('Returned to the site within a month', 1),
-			USERBASE_ACTIVITY_LOGIN_EMAIL => array('Logged in using email link', 1),
-			USERBASE_ACTIVITY_REGISTER_EMAIL => array('Registered using email', 1)
-		);
-
-		UserConfig::$cohort_providers[] = new GenerationCohorts(GenerationCohorts::MONTH);
-		UserConfig::$cohort_providers[] = new GenerationCohorts(GenerationCohorts::WEEK);
-		UserConfig::$cohort_providers[] = new GenerationCohorts(GenerationCohorts::YEAR);
-		UserConfig::$cohort_providers[] = new RegMethodCohorts();
-	}
-
-	/**
-	 * Old way of keeping track of modules.
-	 *
-	 * Couldn't reuse it, but keeping it here because it might be still populated in user configs
-	 * Use UserConfig::$all_modules array instead of needed
-	 *
-	 * @var array
-	 *
-	 * @deprecated
-	 */
-	public static $modules = array();
-
-}
-
 UserConfig::init();
 
 // Gamification badges initializations
diff --git a/depcheck.php b/depcheck.php
index e6cb610..067d794 100644
--- a/depcheck.php
+++ b/depcheck.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Testing for all dependencies StartupAPI has
  * http://startupapi.org/Startup_API/Installation#Prerequisites
diff --git a/edit.php b/edit.php
index 728e951..f2992c3 100644
--- a/edit.php
+++ b/edit.php
@@ -1,7 +1,7 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
-require_once(__DIR__ . '/classes/User.php');
 
 UserConfig::$IGNORE_REQUIRED_EMAIL_VERIFICATION = true;
 
@@ -43,9 +43,9 @@
 			}
 
 			exit;
-		} catch (InputValidationException $ex) {
+		} catch (Exceptions\Authentication\InputValidationException $ex) {
 			$errors[$current_module->getID()] = $ex->getErrors();
-		} catch (ExistingUserException $ex) {
+		} catch (Exceptions\Authentication\ExistingUserException $ex) {
 			$user_exists = true;
 			$errors[$current_module->getID()] = $ex->getErrors();
 		}
diff --git a/edit_account.php b/edit_account.php
index 20800c2..8d4cd2e 100644
--- a/edit_account.php
+++ b/edit_account.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__ . '/global.php');
 
 UserTools::preventCSRF();
diff --git a/global.php b/global.php
index 55c3833..f783e33 100644
--- a/global.php
+++ b/global.php
@@ -1,9 +1,62 @@
 <?php
+namespace StartupAPI;
+
 mb_language('uni');
 mb_internal_encoding('UTF-8');
 header('Content-type: text/html; charset=utf-8');
 
-require_once(__DIR__.'/classes/StartupAPI.php');
+/**
+ * Autoloader for StartupAPI classes to be loaded from ./classes/ folder in the project
+ *
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+  // project-specific namespace prefix
+  $prefix = 'StartupAPI\\';
+
+  // base directory for the namespace prefix
+  $base_dir = __DIR__ . '/classes/';
+  $modules_dir = __DIR__ . '/modules/';
+
+  // does the class use the namespace prefix?
+  $len = strlen($prefix);
+  if (strncmp($prefix, $class, $len) !== 0) {
+    // no, move to the next registered autoloader
+    return;
+  }
+
+  // get the relative class name
+  $relative_class = substr($class, $len);
+
+  // replace the namespace prefix with the base directory, replace namespace
+  // separators with directory separators in the relative class name, append
+  // with .php
+  $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+  // If class is in \StartupAPI\Modules namespace, load it from modules folder
+  if (strpos($relative_class, 'Modules\\') === 0) {
+    $module_class_name = substr($relative_class, strlen('Modules\\'));
+    $module_namespace_name = preg_replace('/\\\\.*$/', '', $module_class_name);
+    foreach (StartupAPIModule::$builtin_modules as $module_slug => $module) {
+      // if this is one of the module classes, load them from modules folder instead
+      if ($module['class'] == $module_namespace_name) {
+        $file = $modules_dir . '/' .
+          $module_slug . '/' .
+          str_replace('\\', '/', $module_class_name) .
+          '.php';
+        break;
+      }
+    }
+  }
+
+  // if the file exists, require it
+  if (file_exists($file)) {
+    require_once $file;
+  } else {
+    error_log("Can't load class $class from $file");
+  }
+});
 
 require_once(__DIR__.'/default_config.php');
 require_once(dirname(__DIR__).'/users_config.php');
diff --git a/index.php b/index.php
index e31aacd..1165628 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * Testing if code is there
  */
@@ -232,7 +234,7 @@
 			// Now when database is ready, we can start registering users
 			$admin_disabled = false;
 		}
-	} catch (DBException $ex) {
+	} catch (Exceptions\DBException $ex) {
 		$database_exception = $ex;
 	}
 }
diff --git a/invitations.php b/invitations.php
index c4ddc63..7cda057 100644
--- a/invitations.php
+++ b/invitations.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
diff --git a/login.php b/login.php
index 3bb576c..06c7a73 100644
--- a/login.php
+++ b/login.php
@@ -1,9 +1,8 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
-require_once(__DIR__ . '/classes/User.php');
-
 // Allow modules to auto-login (if supported)
 $user = null;
 
diff --git a/logout.php b/logout.php
index b67ee01..76a6c10 100644
--- a/logout.php
+++ b/logout.php
@@ -1,7 +1,7 @@
 <?php
-require_once(__DIR__.'/global.php');
+namespace StartupAPI;
 
-require_once(__DIR__.'/classes/User.php');
+require_once(__DIR__.'/global.php');
 
 UserConfig::$IGNORE_REQUIRED_EMAIL_VERIFICATION = true;
 
diff --git a/maillist.php b/maillist.php
index a909381..c2c1ca7 100644
--- a/maillist.php
+++ b/maillist.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
diff --git a/maintenance.php b/maintenance.php
index 0598693..659fd37 100644
--- a/maintenance.php
+++ b/maintenance.php
@@ -1,6 +1,7 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/global.php');
-require_once(__DIR__.'/classes/User.php');
 
 /**
  * maintenance script to be run on a daily basis
diff --git a/manage_account.php b/manage_account.php
index fcede51..03414a1 100644
--- a/manage_account.php
+++ b/manage_account.php
@@ -1,7 +1,7 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
-require_once(__DIR__ . '/classes/User.php');
 
 $user = User::require_login();
 $account = $user->getCurrentAccount();
diff --git a/modules/amazon/index.php b/modules/amazon/AmazonAuthenticationModule.php
similarity index 72%
rename from modules/amazon/index.php
rename to modules/amazon/AmazonAuthenticationModule.php
index f70e169..eb9355a 100644
--- a/modules/amazon/index.php
+++ b/modules/amazon/AmazonAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuth2Module.php');
+namespace StartupAPI\Modules;
 
 /**
  * First register an app here: https://sellercentral.amazon.com/gp/homepage.html
@@ -8,9 +8,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Amazon
  */
-class AmazonAuthenticationModule extends OAuth2AuthenticationModule
+class AmazonAuthenticationModule extends \StartupAPI\OAuth2AuthenticationModule
 {
-	protected $userCredentialsClass = 'AmazonUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\AmazonAuthenticationModule\AmazonUserCredentials';
 
 	public function __construct($oAuth2ClientID, $oAuth2ClientSecret, $scopes = 'profile profile:user_id postal_code')
 	{
@@ -22,9 +22,9 @@ public function __construct($oAuth2ClientID, $oAuth2ClientSecret, $scopes = 'pro
 			'https://www.amazon.com/ap/oa',
 			'https://api.amazon.com/auth/o2/token',
 			$scopes,
-			UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/amazon/login-button.png',
 			array(
 				array(9051, "Logged in using Amazon account", 1),
 				array(9052, "Added Amazon account", 1),
@@ -64,7 +64,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/amazon/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/amazon/images/logo_100x.png';
 		}
 	}
 
@@ -78,10 +78,10 @@ public function getIdentity($oauth2_client_id) {
 			$result = $credentials->makeOAuth2Request('https://api.amazon.com/auth/o2/tokeninfo', 'GET', null, array(
 				CURLOPT_HTTPHEADER => array(
 					'Accept: application/json',
-					'User-Agent: ' . UserConfig::$appName . ' (Startup API v.' . StartupAPI::getVersion() . ')'
+					'User-Agent: ' . \StartupAPI\UserConfig::$appName . ' (Startup API v.' . \StartupAPI\StartupAPI::getVersion() . ')'
 				)
 			));
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			error_log("Error verifying access token: " . $ex->getMessage());
 			return null;
 		}
@@ -91,10 +91,10 @@ public function getIdentity($oauth2_client_id) {
 			$result = $credentials->makeOAuth2Request('https://api.amazon.com/user/profile', 'GET', null, array(
 				CURLOPT_HTTPHEADER => array(
 					'Accept: application/json',
-					'User-Agent: ' . UserConfig::$appName . ' (Startup API v.' . StartupAPI::getVersion() . ')'
+					'User-Agent: ' . \StartupAPI\UserConfig::$appName . ' (Startup API v.' . \StartupAPI\StartupAPI::getVersion() . ')'
 				)
 			));
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			error_log("Error getting identity: " . $ex->getMessage());
 			return null;
 		}
@@ -134,16 +134,9 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/amazon/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * @package StartupAPI
- * @subpackage Authentication\Amazon
- */
-class AmazonUserCredentials extends OAuth2UserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/amazon/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/amazon/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/amazon/AmazonAuthenticationModule/AmazonUserCredentials.php b/modules/amazon/AmazonAuthenticationModule/AmazonUserCredentials.php
new file mode 100644
index 0000000..e732139
--- /dev/null
+++ b/modules/amazon/AmazonAuthenticationModule/AmazonUserCredentials.php
@@ -0,0 +1,15 @@
+<?php
+namespace StartupAPI\Modules\AmazonAuthenticationModule;
+
+/**
+ * @package StartupAPI
+ * @subpackage Authentication\Amazon
+ */
+class AmazonUserCredentials extends \StartupAPI\OAuth2UserCredentials {
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/amazon/credentials.html.twig",
+			$this->userinfo
+		);
+	}
+}
diff --git a/modules/email/index.php b/modules/email/EmailAuthenticationModule.php
similarity index 83%
rename from modules/email/index.php
rename to modules/email/EmailAuthenticationModule.php
index 685eb4d..97fe173 100644
--- a/modules/email/index.php
+++ b/modules/email/EmailAuthenticationModule.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI\Modules;
 
 /**
  * Email authentication module (UNFINISHED)
@@ -11,7 +12,7 @@
  * @package StartupAPI
  * @subpackage Authentication\Email
  */
-class EmailAuthenticationModule extends AuthenticationModule {
+class EmailAuthenticationModule extends \StartupAPI\AuthenticationModule {
 
 	public function getID() {
 		return "email";
@@ -41,9 +42,9 @@ public function getDescription() {
 	 *
 	 * @param User $user User object
 	 *
-	 * @return EmailUserCredentials|null
+	 * @return EmailAuthenticationModule\EmailUserCredentials|null
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCredentials($user) {
 		$db = UserConfig::getDB();
@@ -52,23 +53,23 @@ public function getUserCredentials($user) {
 
 		if ($stmt = $db->prepare('SELECT email FROM u_users WHERE id = ?')) {
 			if (!$stmt->bind_param('i', $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($email)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 
 			if (!is_null($email)) {
-				return new EmailUserCredentials($email);
+				return new EmailAuthenticationModule\EmailUserCredentials($email);
 			}
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return null;
@@ -79,7 +80,7 @@ public function getUserCredentials($user) {
 	 *
 	 * @return int Number of users with email address
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getTotalConnectedUsers() {
 		$db = UserConfig::getDB();
@@ -88,16 +89,16 @@ public function getTotalConnectedUsers() {
 
 		if ($stmt = $db->prepare('SELECT count(*) AS conns FROM u_users WHERE email IS NOT NULL')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($conns)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $conns;
@@ -187,7 +188,7 @@ public function processLoginLink($email, $code) {
 		}
 
 		if (count($errors) > 0) {
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('Validation failed', 0, $errors);
 		}
 
 		// TODO check if code is good and log the user in
@@ -202,8 +203,8 @@ public function processLoginLink($email, $code) {
 	 *
 	 * @return null Never returns a user object
 	 *
-	 * @throws InputValidationException
-	 * @throws ExistingUserException
+	 * @throws Exceptions\Authentication\InputValidationException
+	 * @throws Exceptions\Authentication\ExistingUserException
 	 */
 	public function processRegistration($data, &$remember) {
 		$errors = array();
@@ -227,7 +228,7 @@ public function processRegistration($data, &$remember) {
 		}
 
 		if (count($errors) > 0) {
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('Validation failed', 0, $errors);
 		}
 
 		if (count(User::getUsersByEmailOrUsername($email)) > 0) {
@@ -235,7 +236,7 @@ public function processRegistration($data, &$remember) {
 		}
 
 		if (count($errors) > 0) {
-			throw new ExistingUserException('User already exists', 0, $errors);
+			throw new Exceptions\Authentication\ExistingUserException('User already exists', 0, $errors);
 		}
 
 		// ok, let's create a user
@@ -294,7 +295,7 @@ public function processEditUser($user, $data) {
 		}
 
 		if (count($errors) > 0) {
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('Validation failed', 0, $errors);
 		}
 
 		$user->setName($name);
@@ -308,40 +309,3 @@ public function processEditUser($user, $data) {
 	}
 
 }
-
-/**
- * Email credentials for the user
- *
- * @package StartupAPI
- * @subpackage Authentication\Email
- */
-class EmailUserCredentials extends UserCredentials {
-
-	/**
-	 * @var string User's email address
-	 */
-	private $email;
-
-	/**
-	 * Creates user credentials object
-	 *
-	 * @param string $email User's email address
-	 */
-	public function __construct($email) {
-		$this->email = $email;
-	}
-
-	/**
-	 * Returns user's email address
-	 *
-	 * @return string User's email address
-	 */
-	public function getEmail() {
-		return $this->email;
-	}
-
-	public function getHTML() {
-		return $this->email;
-	}
-
-}
diff --git a/modules/email/EmailAuthenticationModule/EmailUserCredentials.php b/modules/email/EmailAuthenticationModule/EmailUserCredentials.php
new file mode 100644
index 0000000..e5df11a
--- /dev/null
+++ b/modules/email/EmailAuthenticationModule/EmailUserCredentials.php
@@ -0,0 +1,39 @@
+<?php
+namespace StartupAPI\Modules\EmailAuthenticationModule;
+
+/**
+ * Email credentials for the user
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Email
+ */
+class EmailUserCredentials extends \StartupAPI\UserCredentials {
+
+	/**
+	 * @var string User's email address
+	 */
+	private $email;
+
+	/**
+	 * Creates user credentials object
+	 *
+	 * @param string $email User's email address
+	 */
+	public function __construct($email) {
+		$this->email = $email;
+	}
+
+	/**
+	 * Returns user's email address
+	 *
+	 * @return string User's email address
+	 */
+	public function getEmail() {
+		return $this->email;
+	}
+
+	public function getHTML() {
+		return $this->email;
+	}
+
+}
diff --git a/modules/email/login.php b/modules/email/login.php
index 6168a0e..d81dc5e 100644
--- a/modules/email/login.php
+++ b/modules/email/login.php
@@ -1,7 +1,7 @@
 <?php
-require_once(dirname(dirname(__DIR__)) . '/global.php');
+namespace StartupAPI;
 
-require_once(dirname(dirname(__DIR__)) . '/classes/User.php');
+require_once(dirname(dirname(__DIR__)) . '/global.php');
 
 $errors = array();
 
@@ -22,11 +22,11 @@
 
 			exit;
 		} else {
-			throw new InputValidationException('Invalid code', 0, array(
+			throw new Exceptions\Authentication\InputValidationException('Invalid code', 0, array(
 				'code' => array('Invalid code')
 			));
 		}
-	} catch (InputValidationException $ex) {
+	} catch (Exceptions\Authentication\InputValidationException $ex) {
 		$errors = $ex->getErrors();
 	}
 }
diff --git a/modules/etsy/index.php b/modules/etsy/EtsyAuthenticationModule.php
similarity index 81%
rename from modules/etsy/index.php
rename to modules/etsy/EtsyAuthenticationModule.php
index 3644c26..3001613 100644
--- a/modules/etsy/index.php
+++ b/modules/etsy/EtsyAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuthModule.php');
+namespace StartupAPI\Modules;
 
 /**
  * Authenticates users using Etsy (etsy.com) and providers access to their API using OAuth
@@ -9,9 +9,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Etsy
  */
-class EtsyAuthenticationModule extends OAuthAuthenticationModule
+class EtsyAuthenticationModule extends \StartupAPI\OAuthAuthenticationModule
 {
-	protected $userCredentialsClass = 'EtsyUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\EtsyAuthenticationModule\EtsyUserCredentials';
 
 	/**
 	 * @var string Base URL for API calls (prod or sandbox), set based on sandbox flag
@@ -51,9 +51,9 @@ public function __construct($oAuthConsumerKey, $oAuthConsumerSecret, $oAuthScope
 			'https://www.etsy.com/oauth/signin',
 			array('HMAC-SHA1', 'PLAINTEXT'),
 			$oAuthScope,
-			UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/etsy/login-button.png',
 			array(
 				array(7001, "Logged in using Etsy account", 1),
 				array(7002, "Added Etsy account", 1),
@@ -97,7 +97,7 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/etsy/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/etsy/images/logo_100x.png';
 		}
 	}
 
@@ -122,7 +122,7 @@ public static function getSignupURL() {
 	 */
 	public function getIdentity($oauth_user_id) {
 		// get etsy user id
-		$request = new OAuthRequester($this->base_url.'/private/users/__SELF__', 'GET');
+		$request = new \OAuthRequester($this->base_url.'/private/users/__SELF__', 'GET');
 		$result = $request->doRequest($oauth_user_id);
 
 		if ($result['code'] == 200) {
@@ -160,18 +160,6 @@ protected function renderUserInfo($serialized_userinfo) {
 		if (!is_array($template_info)) {
 			$template_info = array();
 		}
-		return StartupAPI::$template->render("@startupapi/modules/etsy/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * Etsy user credentials
- *
- * @package StartupAPI
- * @subpackage Authentication\Etsy
- */
-class EtsyUserCredentials extends OAuthUserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/etsy/user_info.html.twig", unserialize($this->userinfo));
+		return \StartupAPI\StartupAPI::$template->render("@startupapi/modules/etsy/user_info.html.twig", $template_info);
 	}
 }
diff --git a/modules/etsy/EtsyAuthenticationModule/EtsyUserCredentials.php b/modules/etsy/EtsyAuthenticationModule/EtsyUserCredentials.php
new file mode 100644
index 0000000..c326a03
--- /dev/null
+++ b/modules/etsy/EtsyAuthenticationModule/EtsyUserCredentials.php
@@ -0,0 +1,14 @@
+<?php
+namespace StartupAPI\Modules\EtsyAuthenticationModule;
+
+/**
+ * Etsy user credentials
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Etsy
+ */
+class EtsyUserCredentials extends \StartupAPI\OAuthUserCredentials {
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render("@startupapi/modules/etsy/user_info.html.twig", unserialize($this->userinfo));
+	}
+}
diff --git a/modules/external_payment/index.php b/modules/external_payment/ExternalPaymentEngine.php
similarity index 93%
rename from modules/external_payment/index.php
rename to modules/external_payment/ExternalPaymentEngine.php
index 0c5687e..a9eeeff 100644
--- a/modules/external_payment/index.php
+++ b/modules/external_payment/ExternalPaymentEngine.php
@@ -1,14 +1,13 @@
 <?php
+namespace StartupAPI\Modules;
 
 /**
+ * Fake payment engine that just goes to external page and adds value to account when user comes back
+ *
  * @package StartupAPI
  * @subpackage Subscriptions
  */
-
-/**
- * Fake payment engine that just goes to external page and adds value to account when user comes back
- */
-class ExternalPaymentEngine extends PaymentEngine {
+class ExternalPaymentEngine extends \StartupAPI\PaymentEngine {
 
 	/**
 	 * @var int Counter of instances created
@@ -39,7 +38,7 @@ public function __construct($url = null, $button_label = null) {
 		$this->button_label = $button_label;
 
 		if (is_null($this->url)) {
-			$this->url = UserConfig::$USERSROOTFULLURL . '/modules/external_payment/external_page.php';
+			$this->url = \StartupAPI\UserConfig::$USERSROOTFULLURL . '/modules/external_payment/external_page.php';
 		}
 
 		$this->url .= (strstr($this->url, '?') === FALSE ? '?' : '&') . 'engine=' . $this->slug;
diff --git a/modules/external_payment/callback.php b/modules/external_payment/callback.php
index 3ea12d6..24e8a11 100644
--- a/modules/external_payment/callback.php
+++ b/modules/external_payment/callback.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * @package StartupAPI
@@ -14,15 +15,15 @@
 try {
 	// Check if plan and schedule exists
 	if (!array_key_exists('plan', $_GET) || !($plan = Plan::getPlanBySlug($_GET['plan']))) {
-		throw new Exception("Unknown plan '" . UserTools::escape($_GET['plan']) . '"');
+		throw new Exceptions\StartupAPIException("Unknown plan '" . UserTools::escape($_GET['plan']) . '"');
 	}
 
 	if (!array_key_exists('schedule', $_GET) || !($schedule = $plan->getPaymentScheduleBySlug($_GET['schedule']))) {
-		throw new Exception("Unknown schedule '" . UserTools::escape($_GET['schedule']) . "' for plan '" . UserTools::escape($_GET['plan']) . "'");
+		throw new Exceptions\StartupAPIException("Unknown schedule '" . UserTools::escape($_GET['schedule']) . "' for plan '" . UserTools::escape($_GET['plan']) . "'");
 	}
 
 	if (!array_key_exists('engine', $_GET) || !($engine = PaymentEngine::getEngineBySlug($_GET['engine']))) {
-		throw new Exception("Unknown schedule '" . UserTools::escape($_GET['schedule']) . "' for plan '" . UserTools::escape($_GET['plan']) . "'");
+		throw new Exceptions\StartupAPIException("Unknown schedule '" . UserTools::escape($_GET['schedule']) . "' for plan '" . UserTools::escape($_GET['plan']) . "'");
 	}
 } catch (Exception $e) {
 	$_SESSION['message'][] = $e->getMessage();
diff --git a/modules/external_payment/external_page.php b/modules/external_payment/external_page.php
index 6eba458..9ea0624 100644
--- a/modules/external_payment/external_page.php
+++ b/modules/external_payment/external_page.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 /**
  * @package StartupAPI
@@ -26,4 +27,7 @@
 	$template_info['engine']['logo'] = $engine->getLogo();
 }
 
-StartupAPI::$template->display('@startupapi/modules/external_payment/external_page.html.twig', $template_info);
+StartupAPI::$template->display(
+	'@startupapi/modules/external_payment/external_page.html.twig',
+	$template_info
+);
diff --git a/modules/facebook/index.php b/modules/facebook/FacebookAuthenticationModule.php
similarity index 70%
rename from modules/facebook/index.php
rename to modules/facebook/FacebookAuthenticationModule.php
index e5a8e22..c21fca4 100644
--- a/modules/facebook/index.php
+++ b/modules/facebook/FacebookAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(__DIR__ . '/facebook.php');
+namespace StartupAPI\Modules;
 
 /**
  * Facebook Authentication Module
@@ -7,7 +7,7 @@
  * @package StartupAPI
  * @subpackage Authentication\Facebook
  */
-class FacebookAuthenticationModule extends AuthenticationModule {
+class FacebookAuthenticationModule extends \StartupAPI\AuthenticationModule {
 
 	/**
 	 * @var type Stores Facebook SDK object
@@ -68,7 +68,7 @@ public function __construct($appID, $secret, $permissions = array(), $remember =
 			'secret' => $this->secret
 		);
 
-		$this->sdk = new Facebook($config);
+		$this->sdk = new FacebookAuthenticationModule\Facebook($config);
 	}
 
 	public function getID() {
@@ -97,7 +97,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/facebook/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/facebook/images/logo_100x.png';
 		}
 	}
 
@@ -108,70 +108,70 @@ public static function getModulesLogo($size = 100) {
 	 *
 	 * @return FacebookUserCredentials|null FacebookUserCredentials object or null if user is not connected to Facebook
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function getUserCredentials($user) {
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$userid = $user->getID();
 
 		if ($stmt = $db->prepare('SELECT fb_id FROM u_users WHERE id = ?')) {
 			if (!$stmt->bind_param('i', $userid)) {
-				throw new DBBindParamException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($fb_id)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 
 			if (!is_null($fb_id)) {
-				return new FacebookUserCredentials($fb_id);
+				return new FacebookAuthenticationModule\FacebookUserCredentials($fb_id);
 			}
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return null;
 	}
 
 	public function getTotalConnectedUsers() {
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$conns = 0;
 
 		if ($stmt = $db->prepare('SELECT count(*) AS conns FROM u_users WHERE fb_id IS NOT NULL')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($conns)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $conns;
 	}
 
 	public function getDailyRegistrations() {
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$dailyregs = array();
 
 		if ($stmt = $db->prepare('SELECT CAST(regtime AS DATE) AS regdate, count(*) AS regs FROM u_users WHERE fb_id IS NOT NULL GROUP BY regdate')) {
 			if (!$stmt->execute()) {
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($regdate, $regs)) {
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while ($stmt->fetch() === TRUE) {
@@ -180,7 +180,7 @@ public function getDailyRegistrations() {
 
 			$stmt->close();
 		} else {
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $dailyregs;
@@ -188,7 +188,7 @@ public function getDailyRegistrations() {
 
 	public function renderLoginForm($template_info, $action) {
 		if (is_null($action)) {
-			$action = UserConfig::$USERSROOTURL . '/login.php?module=' . $this->getID();
+			$action = \StartupAPI\UserConfig::$USERSROOTURL . '/login.php?module=' . $this->getID();
 		}
 
 		return $this->renderForm($template_info, $action, 'login');
@@ -198,7 +198,7 @@ public function renderAutoLogoutForm($template_info) {
 		$template_info['slug'] = $this->getID();
 		$template_info['appID'] = $this->appID;
 
-		return StartupAPI::$template->display("@startupapi/modules/facebook/auto_logout_form.html.twig", $template_info);
+		return \StartupAPI\StartupAPI::$template->display("@startupapi/modules/facebook/auto_logout_form.html.twig", $template_info);
 	}
 
 	/**
@@ -218,12 +218,15 @@ private function renderForm($template_info, $action, $form) {
 		$template_info['permissions'] = $this->permissions;
 		$template_info['permissions_string'] = implode(',', $this->permissions);
 
-		return StartupAPI::$template->render("@startupapi/modules/facebook/forms.html.twig", $template_info);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/facebook/forms.html.twig",
+			$template_info
+		);
 	}
 
 	public function renderRegistrationForm($template_info, $full = false, $action = null, $errors = null, $data = null) {
 		if (is_null($action)) {
-			$action = UserConfig::$USERSROOTURL . '/register.php?module=' . $this->getID();
+			$action = \StartupAPI\UserConfig::$USERSROOTURL . '/register.php?module=' . $this->getID();
 		}
 
 		return $this->renderForm($template_info, $action, 'register');
@@ -248,8 +251,8 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		} else {
 			try {
 				$me = $this->api('/me?fields=id,name,email,link');
-			} catch (Exception $e) {
-				UserTools::debug("Can't get /me API data: " . $e);
+			} catch (\Exception $e) {
+				\StartupAPI\UserTools::debug("Can't get /me API data: " . $e);
 				return;
 			}
 
@@ -261,12 +264,15 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 			$template_info['me'] = $me;
 			$template_info['fb_id'] = $fb_id;
 
-			return StartupAPI::$template->render("@startupapi/modules/facebook/edit_user_form.html.twig", $template_info);
+			return \StartupAPI\StartupAPI::$template->render(
+				"@startupapi/modules/facebook/edit_user_form.html.twig",
+				$template_info
+			);
 		}
 	}
 
 	public function processAutoLogin() {
-		UserTools::debug('Automatic login start');
+		\StartupAPI\UserTools::debug('Automatic login start');
 
 		$remember = false;
 
@@ -274,7 +280,7 @@ public function processAutoLogin() {
 	}
 
 	public function getAutoLogoutURL($return) {
-		return UserConfig::$USERSROOTFULLURL . '/modules/facebook/logout.php';
+		return \StartupAPI\UserConfig::$USERSROOTFULLURL . '/modules/facebook/logout.php';
 	}
 
 	/**
@@ -291,17 +297,17 @@ public function getAutoLogoutURL($return) {
 	 * @throws InputValidationException
 	 */
 	public function processLogin($post_data, &$remember, $auto = false) {
-		UserTools::debug('processLogin start');
+		\StartupAPI\UserTools::debug('processLogin start');
 		$remember = $this->remember;
 
 		try {
 			$fbuser = $this->sdk->getUser();
-		} catch (FacebookApiException $e) {
-			UserTools::debug("Can't get Facebook user");
+		} catch (\FacebookApiException $e) {
+			\StartupAPI\UserTools::debug("Can't get Facebook user");
 			return null;
 		}
 
-		UserTools::debug('Facebook user id: ' . $fbuser);
+		\StartupAPI\UserTools::debug('Facebook user id: ' . $fbuser);
 
 		if ($fbuser == 0) {
 			// if we're trying to auto-login, just return null
@@ -310,32 +316,32 @@ public function processLogin($post_data, &$remember, $auto = false) {
 			}
 
 			$errors['fbuserid'][] = 'No Facebook id is passed';
-			throw new InputValidationException('No facebook user id', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\InputValidationException('No facebook user id', 0, $errors);
 		}
 
 		try {
 			$permissions = $this->api('/me/permissions');
-			UserTools::debug('User permissions: ' . var_export($permissions, true));
+			\StartupAPI\UserTools::debug('User permissions: ' . var_export($permissions, true));
 			foreach ($this->permissions as $perm) {
 				if (!array_key_exists($perm, $permissions['data'][0]) || $permissions['data'][0][$perm] !== 1) {
 					// looks like not all required permissions were granted
-					UserTools::debug("Can't login - not enough permissions granted");
+					\StartupAPI\UserTools::debug("Can't login - not enough permissions granted");
 					return null;
 				}
 			}
-		} catch (Exception $e) {
-			UserTools::debug("Can't get FB /me/permissions API data: " . $e);
+		} catch (\StartupAPI\Exception $e) {
+			\StartupAPI\UserTools::debug("Can't get FB /me/permissions API data: " . $e);
 			return null;
 		}
 
-		$user = User::getUserByFacebookID($fbuser);
+		$user = \StartupAPI\User::getUserByFacebookID($fbuser);
 
 		if (!is_null($user)) {
 			$user->recordActivity(USERBASE_ACTIVITY_LOGIN_FB);
 			return $user;
 		} else if ($auto) {
 			// do not auto-register if auto-logging-in
-			UserTools::debug('Auto-logged-in, not registering');
+			\StartupAPI\UserTools::debug('Auto-logged-in, not registering');
 			return null;
 		} else {
 			return $this->processRegistration($post_data, $remember);
@@ -343,34 +349,36 @@ public function processLogin($post_data, &$remember, $auto = false) {
 	}
 
 	public function processRegistration($post_data, &$remember) {
-		UserTools::debug('processRegistration start');
+		\StartupAPI\UserTools::debug('processRegistration start');
 		$remember = $this->remember;
 
 		try {
 			$fbuser = $this->sdk->getUser();
-		} catch (FacebookApiException $e) {
-			UserTools::debug("Can't get Facebook user");
+		} catch (\FacebookApiException $e) {
+			\StartupAPI\UserTools::debug("Can't get Facebook user");
 			return null;
 		}
 
 		$errors = array();
 		if ($fbuser == 0) {
 			$errors['fbuserid'][] = 'No Facebook id is passed';
-			throw new InputValidationException('No facebook user id', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('No facebook user id', 0, $errors);
 		}
 
 		// checking if user with this Facebook ID already exists and if so, then logs them in
-		$existing_user = User::getUserByFacebookID($fbuser);
+		$existing_user = \StartupAPI\User::getUserByFacebookID($fbuser);
 		if (!is_null($existing_user)) {
-			UserTools::debug('processRegistration - existing user: ' . $existing_user->getID());
+			\StartupAPI\UserTools::debug(
+				'processRegistration - existing user: ' . $existing_user->getID()
+			);
 			$existing_user->recordActivity(USERBASE_ACTIVITY_LOGIN_FB);
 			return $existing_user;
 		}
 
 		try {
 			$me = $this->api('/me?fields=id,name,email,link');
-		} catch (Exception $e) {
-			UserTools::debug("Can't get /me API data: " . $e);
+		} catch (\Exception $e) {
+			\StartupAPI\UserTools::debug("Can't get /me API data: " . $e);
 			return null;
 		}
 
@@ -382,13 +390,15 @@ public function processRegistration($post_data, &$remember) {
 
 		// ok, let's create a user
 		try {
-			$user = User::createNewFacebookUser($name, $fbuser, $me);
-		} catch (UserCreationException $e) {
+			$user = \StartupAPI\User::createNewFacebookUser($name, $fbuser, $me);
+		} catch (\StartupAPI\Exceptions\Authentication\UserCreationException $e) {
 			$errors[$e->getField()][] = $e->getMessage();
 		}
 
 		if (count($errors) > 0) {
-			throw new ExistingUserException('User already exists', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\ExistingUserException(
+				'User already exists', 0, $errors
+			);
 		}
 
 		$user->recordActivity(USERBASE_ACTIVITY_REGISTER_FB);
@@ -409,23 +419,23 @@ public function processEditUser($user, $data) {
 
 		try {
 			$fbuser = $this->sdk->getUser();
-		} catch (FacebookApiException $e) {
-			UserTools::debug("Can't get Facebook user");
+		} catch (\FacebookApiException $e) {
+			\StartupAPI\UserTools::debug("Can't get Facebook user");
 			return null;
 		}
 
 		$errors = array();
 		if ($fbuser == 0) {
 			$errors['fbuserid'][] = 'No Facebook id is passed';
-			throw new InputValidationException('No facebook user id', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('No facebook user id', 0, $errors);
 		}
 
-		if (!is_null(User::getUserByFacebookID($fbuser))) {
+		if (!is_null(\StartupAPI\User::getUserByFacebookID($fbuser))) {
 			$errors['fbuserid'][] = 'Another user is already associated with your Facebook account.';
 		}
 
 		if (count($errors) > 0) {
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new Exceptions\Authentication\InputValidationException('Validation failed', 0, $errors);
 		}
 
 		$user->setFacebookID($fbuser);
@@ -434,8 +444,8 @@ public function processEditUser($user, $data) {
 		if (!$user->getEmail()) {
 			try {
 				$me = $this->api('/me?fields=email');
-			} catch (Exception $e) {
-				UserTools::debug("Can't get /me API data: " . $e);
+			} catch (\Exception $e) {
+				\StartupAPI\UserTools::debug("Can't get /me API data: " . $e);
 				return null;
 			}
 
@@ -465,13 +475,13 @@ public function api(/* polymorphic */) {
 
 		try {
 			$result = call_user_func_array(array($this->sdk, 'api'), $args);
-		} catch (FacebookApiException $fb_ex) {
+		} catch (\FacebookApiException $fb_ex) {
 			$message = $fb_ex->getMessage();
 
 			if (strpos($message, 'An active access token must be used') !== false ||
 					strpos($message, 'Session has expired at unix time') !== false
 			) {
-				UserTools::debug('Facebook access token has expired, redirecting to login');
+				\StartupAPI\UserTools::debug('Facebook access token has expired, redirecting to login');
 
 				// looks like we have a problem with token, let's redirect to login
 				$url = $this->sdk->getLoginUrl(array(
@@ -497,40 +507,3 @@ public function isCompact() {
 	}
 
 }
-
-/**
- * User credentials for Facebook users
- *
- * @package StartupAPI
- * @subpackage Authentication\Facebook
- */
-class FacebookUserCredentials extends UserCredentials {
-
-	/**
-	 * @var int Facebook user id
-	 */
-	private $fb_id;
-
-	/**
-	 * Creates credemtials onject
-	 *
-	 * @param int $fb_id Facebook user ID
-	 */
-	public function __construct($fb_id) {
-		$this->fb_id = $fb_id;
-	}
-
-	/**
-	 * Returns Facebook user ID
-	 *
-	 * @return int Facebook user ID
-	 */
-	public function getFacebookID() {
-		return $this->fb_id;
-	}
-
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/facebook/credentials.html.twig", array('fb_id' => $this->fb_id));
-	}
-
-}
diff --git a/modules/facebook/facebook.php b/modules/facebook/FacebookAuthenticationModule/Facebook.php
similarity index 92%
rename from modules/facebook/facebook.php
rename to modules/facebook/FacebookAuthenticationModule/Facebook.php
index 2a71293..a67f97d 100644
--- a/modules/facebook/facebook.php
+++ b/modules/facebook/FacebookAuthenticationModule/Facebook.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI\Modules\FacebookAuthenticationModule;
+
 /**
  * Copyright 2011 Facebook, Inc.
  *
@@ -15,9 +17,7 @@
  * under the License.
  */
 
-require_once __DIR__."/facebook-php-sdk/src/base_facebook.php";
-
-require_once(dirname(dirname(__DIR__)).'/global.php');
+require_once dirname(__DIR__)."/facebook-php-sdk/src/base_facebook.php";
 
 /**
  * Extends the BaseFacebook class with the intent of using
@@ -28,7 +28,7 @@
  * @package StartupAPI
  * @subpackage Authentication\Facebook
  */
-class Facebook extends BaseFacebook
+class Facebook extends \BaseFacebook
 {
 	/**
 	* Identical to the parent constructor, except that
@@ -120,6 +120,6 @@ protected function clearAllPersistentData() {
 	 * @return string Storage variable name
 	 */
 	protected function constructSessionVariableName($key) {
-		return implode('_', array(UserConfig::$facebook_storage_key_prefix, $this->getAppId(), $key));
+		return implode('_', array(\StartupAPI\UserConfig::$facebook_storage_key_prefix, $this->getAppId(), $key));
 	}
 }
diff --git a/modules/facebook/FacebookAuthenticationModule/FacebookUserCredentials.php b/modules/facebook/FacebookAuthenticationModule/FacebookUserCredentials.php
new file mode 100644
index 0000000..83d1890
--- /dev/null
+++ b/modules/facebook/FacebookAuthenticationModule/FacebookUserCredentials.php
@@ -0,0 +1,42 @@
+<?php
+namespace StartupAPI\Modules\FacebookAuthenticationModule;
+
+/**
+ * User credentials for Facebook users
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Facebook
+ */
+class FacebookUserCredentials extends \StartupAPI\UserCredentials {
+
+	/**
+	 * @var int Facebook user id
+	 */
+	private $fb_id;
+
+	/**
+	 * Creates credemtials onject
+	 *
+	 * @param int $fb_id Facebook user ID
+	 */
+	public function __construct($fb_id) {
+		$this->fb_id = $fb_id;
+	}
+
+	/**
+	 * Returns Facebook user ID
+	 *
+	 * @return int Facebook user ID
+	 */
+	public function getFacebookID() {
+		return $this->fb_id;
+	}
+
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/facebook/credentials.html.twig",
+			array('fb_id' => $this->fb_id)
+		);
+	}
+
+}
diff --git a/modules/facebook/logout.php b/modules/facebook/logout.php
index 62b2532..b4da928 100644
--- a/modules/facebook/logout.php
+++ b/modules/facebook/logout.php
@@ -1,7 +1,7 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/global.php');
+namespace StartupAPI;
 
-require_once(dirname(dirname(__DIR__)).'/classes/User.php');
+require_once(dirname(dirname(__DIR__)).'/global.php');
 
 $module = AuthenticationModule::get('facebook');
 
diff --git a/modules/foursquare/index.php b/modules/foursquare/FoursquareAuthenticationModule.php
similarity index 80%
rename from modules/foursquare/index.php
rename to modules/foursquare/FoursquareAuthenticationModule.php
index 2343643..ba9a35b 100644
--- a/modules/foursquare/index.php
+++ b/modules/foursquare/FoursquareAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuth2Module.php');
+namespace StartupAPI\Modules;
 
 /**
  * First register an app here: https://foursquare.com/developers/apps
@@ -8,11 +8,11 @@
  * @package StartupAPI
  * @subpackage Authentication\Foursquare
  */
-class FoursquareAuthenticationModule extends OAuth2AuthenticationModule
+class FoursquareAuthenticationModule extends \StartupAPI\OAuth2AuthenticationModule
 {
 	const COMPATIBILITY_DATE = '20130302';
 
-	protected $userCredentialsClass = 'FoursquareUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\FoursquareAuthenticationModule\FoursquareUserCredentials';
 
 	public function __construct($oAuth2ClientID, $oAuth2ClientSecret, $scopes = '')
 	{
@@ -67,7 +67,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/foursquare/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/foursquare/images/logo_100x.png';
 		}
 	}
 
@@ -77,7 +77,7 @@ public function getIdentity($oauth2_client_id) {
 
 		try {
 			$result = $credentials->makeOAuth2Request('https://api.foursquare.com/v2/users/self');
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			return null;
 		}
 
@@ -130,16 +130,9 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/foursquare/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * @package StartupAPI
- * @subpackage Authentication\Foursquare
- */
-class FoursquareUserCredentials extends OAuth2UserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/foursquare/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/foursquare/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/foursquare/FoursquareAuthenticationModule/FoursquareUserCredentials.php b/modules/foursquare/FoursquareAuthenticationModule/FoursquareUserCredentials.php
new file mode 100644
index 0000000..84d2118
--- /dev/null
+++ b/modules/foursquare/FoursquareAuthenticationModule/FoursquareUserCredentials.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Modules\FoursquareAuthenticationModule;
+
+/**
+ * @package StartupAPI
+ * @subpackage Authentication\Foursquare
+ */
+class FoursquareUserCredentials extends \StartupAPI\OAuth2UserCredentials {
+	public function getHTML() {
+		return StartupAPI::$template->render("@startupapi/modules/foursquare/credentials.html.twig", $this->userinfo);
+	}
+}
diff --git a/modules/github/index.php b/modules/github/GithubAuthenticationModule.php
similarity index 75%
rename from modules/github/index.php
rename to modules/github/GithubAuthenticationModule.php
index dd8c0e5..5875773 100644
--- a/modules/github/index.php
+++ b/modules/github/GithubAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuth2Module.php');
+namespace StartupAPI\Modules;
 
 /**
  * First register an app here: https://github.com/settings/applications/new
@@ -8,9 +8,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Githib
  */
-class GithubAuthenticationModule extends OAuth2AuthenticationModule
+class GithubAuthenticationModule extends \StartupAPI\OAuth2AuthenticationModule
 {
-	protected $userCredentialsClass = 'GithubUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\GithubAuthenticationModule\GithubUserCredentials';
 
 	public function __construct($oAuth2ClientID, $oAuth2ClientSecret, $scopes = '')
 	{
@@ -62,7 +62,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/github/images/octocat_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/github/images/octocat_100x.png';
 		}
 	}
 
@@ -73,10 +73,10 @@ public function getIdentity($oauth2_client_id) {
 			$result = $credentials->makeOAuth2Request('https://api.github.com/user', 'GET', null, array(
 				CURLOPT_HTTPHEADER => array(
 					'Accept: application/json',
-					'User-Agent: ' . UserConfig::$appName . ' (Startup API v.' . StartupAPI::getVersion() . ')'
+					'User-Agent: ' . \StartupAPI\UserConfig::$appName . ' (Startup API v.' . StartupAPI::getVersion() . ')'
 				)
 			));
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			return null;
 		}
 
@@ -115,16 +115,9 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/github/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * @package StartupAPI
- * @subpackage Authentication\Github
- */
-class GithubUserCredentials extends OAuth2UserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/github/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/github/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/github/GithubAuthenticationModule/GithubUserCredentials.php b/modules/github/GithubAuthenticationModule/GithubUserCredentials.php
new file mode 100644
index 0000000..2802df9
--- /dev/null
+++ b/modules/github/GithubAuthenticationModule/GithubUserCredentials.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Modules\GithubAuthenticationModule;
+
+/**
+ * @package StartupAPI
+ * @subpackage Authentication\Github
+ */
+class GithubUserCredentials extends \StartupAPI\OAuth2UserCredentials {
+	public function getHTML() {
+		return StartupAPI::$template->render("@startupapi/modules/github/credentials.html.twig", $this->userinfo);
+	}
+}
diff --git a/modules/google/index.php b/modules/google/GoogleAuthenticationModule.php
similarity index 72%
rename from modules/google/index.php
rename to modules/google/GoogleAuthenticationModule.php
index 3c981f1..9a283ed 100644
--- a/modules/google/index.php
+++ b/modules/google/GoogleAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuth2Module.php');
+namespace StartupAPI\Modules;
 
 /**
  * First register an app here: https://console.developers.google.com/project
@@ -8,9 +8,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Google
  */
-class GoogleAuthenticationModule extends OAuth2AuthenticationModule
+class GoogleAuthenticationModule extends \StartupAPI\OAuth2AuthenticationModule
 {
-	protected $userCredentialsClass = 'GoogleUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\GoogleAuthenticationModule\GoogleUserCredentials';
 
 	public function __construct($oAuth2ClientID, $oAuth2ClientSecret,
 		$scopes = 'profile'
@@ -23,9 +23,9 @@ public function __construct($oAuth2ClientID, $oAuth2ClientSecret,
 			'https://accounts.google.com/o/oauth2/auth',
 			'https://www.googleapis.com/oauth2/v3/token',
 			$scopes,
-			UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/google/login-button.png',
 			array(
 				array(3005, "Logged in using Google account", 1),
 				array(3006, "Added Google account", 1),
@@ -65,7 +65,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/google/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/google/images/logo_100x.png';
 		}
 	}
 
@@ -74,7 +74,7 @@ public function getIdentity($oauth2_client_id) {
 
 		try {
 			$result = $credentials->makeOAuth2Request('https://www.googleapis.com/plus/v1/people/me');
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			return null;
 		}
 
@@ -101,7 +101,7 @@ public function getIdentity($oauth2_client_id) {
 		}
 
 		if (array_key_exists('error', $data)) {
-			UserTools::debug("Got errors from /people/me API call: " . var_export($data['error'], true));
+			\StartupAPI\UserTools::debug("Got errors from /people/me API call: " . var_export($data['error'], true));
 			return null;
 		}
 
@@ -110,7 +110,7 @@ public function getIdentity($oauth2_client_id) {
 		) {
 			$user_info['name'] = $user_info['displayName'];
 		} else {
-			UserTools::debug("Don't have ID or displayName: " . var_export($user_info, true));
+			\StartupAPI\UserTools::debug("Don't have ID or displayName: " . var_export($user_info, true));
 			return null;
 		}
 
@@ -126,16 +126,6 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/google/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * @package StartupAPI
- * @subpackage Authentication\Google
- */
-class GoogleUserCredentials extends OAuth2UserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/google/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render("@startupapi/modules/google/user_info.html.twig", $template_info);
 	}
 }
diff --git a/modules/google/GoogleAuthenticationModule/GoogleUserCredentials.php b/modules/google/GoogleAuthenticationModule/GoogleUserCredentials.php
new file mode 100644
index 0000000..9d4198e
--- /dev/null
+++ b/modules/google/GoogleAuthenticationModule/GoogleUserCredentials.php
@@ -0,0 +1,15 @@
+<?php
+namespace StartupAPI\Modules\GoogleAuthenticationModule;
+
+/**
+ * @package StartupAPI
+ * @subpackage Authentication\Google
+ */
+class GoogleUserCredentials extends \StartupAPI\OAuth2UserCredentials {
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/google/credentials.html.twig",
+			$this->userinfo
+		);
+	}
+}
diff --git a/modules/google_oauth/images/logo_100x.png b/modules/google_oauth/images/logo_100x.png
deleted file mode 100644
index 05879cf..0000000
Binary files a/modules/google_oauth/images/logo_100x.png and /dev/null differ
diff --git a/modules/google_oauth/index.php b/modules/google_oauth/index.php
deleted file mode 100644
index 6602736..0000000
--- a/modules/google_oauth/index.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__DIR__)) . '/classes/OAuthModule.php');
-
-/**
- * Google OAuth (v1) authentication module
- *
- * Provides authentication using Google accounts and API access using OAuth
- *
- * Note that Google deprecated OAuth v1 support for new APIs and will be converting
- * all APIs to OAuth v2. Authentication and old APIs are still functional per
- * Google's deprecation policy.
- *
- * @package StartupAPI
- * @subpackage Authentication\Google
- */
-class GoogleOAuthAuthenticationModule extends OAuthAuthenticationModule {
-
-	protected $userCredentialsClass = 'GoogleOAuthUserCredentials';
-
-	/**
-	 * Constructor for Google OAuth module
-	 * @param string $oAuthConsumerKey OAuth Consumer Key
-	 * @param string $oAuthConsumerSecret OAuth Consumer Secret
-	 * @param array $GoogleAPIScopes (optional) Array of Google API Scopes
-	 * 		See full list here: http://code.google.com/apis/gdata/faq.html#AuthScopes
-	 */
-	public function __construct($oAuthConsumerKey, $oAuthConsumerSecret, $GoogleAPIScopes = null) {
-		// default scope needed for identity verification
-		// TODO rewrite using hybrid OpenID + OAuth implementation
-		$scopes = array('https://www.google.com/m8/feeds/');
-
-		if (is_array($GoogleAPIScopes)) {
-			$scopes = array_merge($scopes, $GoogleAPIScopes);
-		}
-
-		parent::__construct(
-			'Google', 'https://www.google.com/',
-			$oAuthConsumerKey, $oAuthConsumerSecret,
-			'https://www.google.com/accounts/OAuthGetRequestToken',
-			'https://www.google.com/accounts/OAuthGetAccessToken',
-			'https://www.google.com/accounts/OAuthAuthorizeToken',
-			array('HMAC-SHA1'),
-			implode(' ', $scopes),
-			UserConfig::$USERSROOTURL . '/modules/google_oauth/login-button.png',
-			UserConfig::$USERSROOTURL . '/modules/google_oauth/login-button.png',
-			UserConfig::$USERSROOTURL . '/modules/google_oauth/login-button.png',
-			array(
-				array(3001, "Logged in using Google account", 1),
-				array(3002, "Added Google account", 1),
-				array(3003, "Removed Google account", 0),
-				array(3004, "Registered using Google account", 1)
-			)
-		);
-	}
-
-	public function getID() {
-		return "google-oauth";
-	}
-
-	public function getLegendColor() {
-		return "e51837";
-	}
-
-	public static function getModulesTitle() {
-		return "Google";
-	}
-
-	public static function getModulesDescription() {
-		return <<<EOF
-			<p>Google OAuth (v1) authentication module provides authentication
-				using Google accounts and API access using OAuth</p>
-			<p>Note that Google deprecated OAuth v1 support for new APIs and will be converting
-				all APIs to OAuth v2. Authentication and old APIs are still functional per
-				<a target="_blank" href="https://developers.google.com/accounts/terms">Google's deprecation policy</a></p>
-EOF;
-	}
-
-	public function getDescription() {
-		return self::getModulesDescription();
-	}
-
-	public static function getModulesLogo($size = 100) {
-		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/google_oauth/images/logo_100x.png';
-		}
-	}
-
-	public static function getSignupURL() {
-		return 'https://www.google.com/accounts/ManageDomains';
-	}
-
-	public function getIdentity($oauth_user_id) {
-		// get meetup user id
-		$request = new OAuthRequester('https://www.google.com/m8/feeds/groups/default/thin', 'GET');
-		$result = $request->doRequest($oauth_user_id);
-
-		if ($result['code'] == 200) {
-			$raw_xml = $result['body'];
-			$xml = new SimpleXMLElement($raw_xml);
-
-			return array(
-				'id' => (string) $xml->id,
-				'name' => (string) $xml->author->name,
-				'email' => (string) $xml->author->email
-			);
-		}
-
-		return null;
-	}
-
-}
-
-/**
- * Google user credentials, primarily storing OAuth tokens
- *
- * @package StartupAPI
- * @subpackage Authentication\Google
- */
-class GoogleOAuthUserCredentials extends OAuthUserCredentials {
-
-}
diff --git a/modules/google_oauth/login-button.png b/modules/google_oauth/login-button.png
deleted file mode 100644
index f9a0eb9..0000000
Binary files a/modules/google_oauth/login-button.png and /dev/null differ
diff --git a/modules/instagram/index.php b/modules/instagram/InstagramAuthenticationModule.php
similarity index 68%
rename from modules/instagram/index.php
rename to modules/instagram/InstagramAuthenticationModule.php
index c013712..ba63630 100644
--- a/modules/instagram/index.php
+++ b/modules/instagram/InstagramAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuth2Module.php');
+namespace StartupAPI\Modules;
 
 /**
  * First register an app here: https://instagram.com/developer/clients/register/
@@ -8,9 +8,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Instagram
  */
-class InstagramAuthenticationModule extends OAuth2AuthenticationModule
+class InstagramAuthenticationModule extends \StartupAPI\OAuth2AuthenticationModule
 {
-	protected $userCredentialsClass = 'InstagramUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\InstagramAuthenticationModule\InstagramUserCredentials';
 
 	public function __construct($oAuth2ClientID, $oAuth2ClientSecret,
 		$scopes = 'basic'
@@ -23,9 +23,9 @@ public function __construct($oAuth2ClientID, $oAuth2ClientSecret,
 			'https://api.instagram.com/oauth/authorize/',
 			'https://api.instagram.com/oauth/access_token',
 			$scopes,
-			UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/instagram/login-button.png',
 			array(
 				array(11005, "Logged in using Instagram account", 1),
 				array(11006, "Added Instagram account", 1),
@@ -63,7 +63,7 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/instagram/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/instagram/images/logo_100x.png';
 		}
 	}
 
@@ -72,7 +72,7 @@ public function getIdentity($oauth2_client_id) {
 
 		try {
 			$result = $credentials->makeOAuth2Request('https://api.instagram.com/v1/users/self');
-		} catch (OAuth2Exception $ex) {
+		} catch (\StartupAPI\Exceptions\OAuth2Exception $ex) {
 			return null;
 		}
 
@@ -99,12 +99,12 @@ public function getIdentity($oauth2_client_id) {
 		}
 
 		if ($data['meta']['code'] != 200) {
-			UserTools::debug("Got API error from /users/self call: " . var_export($data['error'], true));
+			\StartupAPI\UserTools::debug("Got API error from /users/self call: " . var_export($data['error'], true));
 			return null;
 		}
 
 		if (array_key_exists('error', $data)) {
-			UserTools::debug("Got errors from /users/self API call: " . var_export($data['error'], true));
+			\StartupAPI\UserTools::debug("Got errors from /users/self API call: " . var_export($data['error'], true));
 			return null;
 		}
 
@@ -113,7 +113,7 @@ public function getIdentity($oauth2_client_id) {
 		) {
 			$user_info['name'] = $user_info['full_name'];
 		} else {
-			UserTools::debug("Don't have ID or full_name: " . var_export($user_info, true));
+			\StartupAPI\UserTools::debug("Don't have ID or full_name: " . var_export($user_info, true));
 			return null;
 		}
 		return $user_info;
@@ -125,16 +125,9 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/instagram/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * @package StartupAPI
- * @subpackage Authentication\Instagram
- */
-class InstagramUserCredentials extends OAuth2UserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/instagram/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/instagram/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/instagram/InstagramAuthenticationModule/InstagramUserCredentials.php b/modules/instagram/InstagramAuthenticationModule/InstagramUserCredentials.php
new file mode 100644
index 0000000..0e5e8e8
--- /dev/null
+++ b/modules/instagram/InstagramAuthenticationModule/InstagramUserCredentials.php
@@ -0,0 +1,15 @@
+<?php
+namespace StartupAPI\Modules\InstagramAuthenticationModule;
+
+/**
+ * @package StartupAPI
+ * @subpackage Authentication\Instagram
+ */
+class InstagramUserCredentials extends \StartupAPI\OAuth2UserCredentials {
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/instagram/credentials.html.twig",
+			$this->userinfo
+		);
+	}
+}
diff --git a/modules/linkedin/index.php b/modules/linkedin/LinkedInAuthenticationModule.php
similarity index 67%
rename from modules/linkedin/index.php
rename to modules/linkedin/LinkedInAuthenticationModule.php
index c4ed9b0..b2a8118 100644
--- a/modules/linkedin/index.php
+++ b/modules/linkedin/LinkedInAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)) . '/classes/OAuthModule.php');
+namespace StartupAPI\Modules;
 
 /**
  * LinkedIn authorization modlue
@@ -10,9 +10,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Linkedin
  */
-class LinkedInAuthenticationModule extends OAuthAuthenticationModule {
+class LinkedInAuthenticationModule extends \StartupAPI\OAuthAuthenticationModule {
 
-	protected $userCredentialsClass = 'LinkedInUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\LinkedInAuthenticationModule\LinkedInUserCredentials';
 
 	/**
 	 * Instantiates LinkedIn authentication module and registers it with the system
@@ -32,9 +32,9 @@ public function __construct($oAuthConsumerKey, $oAuthConsumerSecret, $oAuthScope
 			'https://www.linkedin.com/uas/oauth/authenticate',
 			array('HMAC-SHA1', 'PLAINTEXT'),
 			$oAuthScope,
-			UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png',
-			UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png',
-			UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png'
+			\StartupAPI\UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png',
+			\StartupAPI\UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png',
+			\StartupAPI\UserConfig::$USERSROOTURL . '/modules/linkedin/linkedin-small.png'
 		);
 	}
 
@@ -65,12 +65,15 @@ public static function getSignupURL() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/linkedin/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/linkedin/images/logo_100x.png';
 		}
 	}
 
 	public function getIdentity($oauth_user_id) {
-		$request = new OAuthRequester('http://api.linkedin.com/v1/people/~:(id,formatted-name,picture-url,public-profile-url)?format=json', 'GET');
+		$request = new \OAuthRequester(
+			'http://api.linkedin.com/v1/people/~:(id,formatted-name,picture-url,public-profile-url)?format=json',
+			'GET'
+		);
 		$result = $request->doRequest($oauth_user_id);
 
 		if ($result['code'] == 200) {
@@ -92,21 +95,7 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/linkedin/user_info.html.twig", $template_info);
-	}
-
-}
-
-/**
- * LinkedIn user credentials class
- *
- * @package StartupAPI
- * @subpackage Authentication\Linkedin
- */
-class LinkedInUserCredentials extends OAuthUserCredentials {
-
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/linkedin/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render("@startupapi/modules/linkedin/user_info.html.twig", $template_info);
 	}
 
 }
diff --git a/modules/linkedin/LinkedInAuthenticationModule/LinkedInUserCredentials.php b/modules/linkedin/LinkedInAuthenticationModule/LinkedInUserCredentials.php
new file mode 100644
index 0000000..5d9c6d5
--- /dev/null
+++ b/modules/linkedin/LinkedInAuthenticationModule/LinkedInUserCredentials.php
@@ -0,0 +1,19 @@
+<?php
+namespace StartupAPI\Modules\LinkedInAuthenticationModule;
+
+/**
+ * LinkedIn user credentials class
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Linkedin
+ */
+class LinkedInUserCredentials extends \StartupAPI\OAuthUserCredentials {
+
+	public function getHTML() {
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/linkedin/credentials.html.twig",
+			$this->userinfo
+		);
+	}
+
+}
diff --git a/modules/mailchimp/index.php b/modules/mailchimp/MailChimpModule.php
similarity index 85%
rename from modules/mailchimp/index.php
rename to modules/mailchimp/MailChimpModule.php
index 3f88b5e..1bba962 100644
--- a/modules/mailchimp/index.php
+++ b/modules/mailchimp/MailChimpModule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI\Modules;
+
 /**
  * MailChip mailing list integration module (UNFINISHED)
  *
@@ -9,7 +11,7 @@
  * @package StartupAPI
  * @subpackage Email\MailChimp
  */
-class MailChimpModule extends EmailModule
+class MailChimpModule extends \StartupAPI\EmailModule
 {
 	/**
 	 * @var string MailChimp API key
@@ -46,7 +48,7 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/mailchimp/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/mailchimp/images/logo_100x.png';
 		}
 	}
 
@@ -72,7 +74,7 @@ public function __construct($apiKey, $listID) {
 		$pos = strpos($apiKey, '-');
 
 		if ($pos === FALSE) {
-			throw new MailChimpException("Wrong API key. Expected '-' in it somewhere.");
+			throw new MailChimpModule\MailChimpException("Wrong API key. Expected '-' in it somewhere.");
 		}
 
 		$datacenter = substr($apiKey, $pos + 1);
@@ -106,12 +108,12 @@ public function registerSubscriber($user) {
 		$result = curl_exec($ch);
 
 		if (curl_getinfo($ch, CURLINFO_HTTP_CODE) != 200) {
-			throw new MailChimpException("API call failed: ".curl_error($ch));
+			throw new MailChimpModule\MailChimpException("API call failed: ".curl_error($ch));
 		}
 		curl_close($ch);
 
 		if ($result !== 'true') {
-			throw new EmailSubscriptionException("MailChimp subscription failed: ".var_export($result, true));
+			throw new \StartupAPI\Exceptions\Email\EmailSubscriptionException("MailChimp subscription failed: ".var_export($result, true));
 		}
 	}
 
@@ -135,11 +137,3 @@ public function hasUserInfoChanged($old_user, $new_user) {
 		return ($old_user->getName() != $new_user->getName());
 	}
 }
-
-/**
- * MailChimp integration exception
- *
- * @package StartupAPI
- * @subpackage Email\MailChimp
- */
-class MailChimpException extends StartupAPIException { }
diff --git a/modules/mailchimp/MailChimpModule/MailChimpException.php b/modules/mailchimp/MailChimpModule/MailChimpException.php
new file mode 100644
index 0000000..4adab21
--- /dev/null
+++ b/modules/mailchimp/MailChimpModule/MailChimpException.php
@@ -0,0 +1,12 @@
+<?php
+namespace StartupAPI\Modules\MailChimpModule;
+
+/**
+ * MailChimp integration exception
+ *
+ * @package StartupAPI
+ * @subpackage Email\MailChimp
+ */
+class MailChimpException extends \StartupAPI\Exceptions\StartupAPIException {
+
+}
diff --git a/modules/manual/index.php b/modules/manual/ManualPaymentEngine.php
similarity index 83%
rename from modules/manual/index.php
rename to modules/manual/ManualPaymentEngine.php
index 5d54fe3..4c3e16e 100644
--- a/modules/manual/index.php
+++ b/modules/manual/ManualPaymentEngine.php
@@ -1,14 +1,13 @@
 <?php
+namespace StartupAPI\Modules;
 
 /**
+ * Manual payment engine used for consierge subscription
+ *
  * @package StartupAPI
  * @subpackage Subscriptions
  */
-
-/**
- * Manual payment engine used for consierge subscription
- */
-class ManualPaymentEngine extends PaymentEngine {
+class ManualPaymentEngine extends \StartupAPI\PaymentEngine {
 
 	/**
 	 * @var boolean Singleton flag
@@ -76,7 +75,7 @@ public function changeSubscription($account_id, $plan_slug, $schedule_slug) {
 	 *
 	 * @return boolean True if transaction details were successfully recorded
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function storeTransactionDetails($transaction_id, $details) {
 
@@ -89,19 +88,19 @@ public function storeTransactionDetails($transaction_id, $details) {
 			$$i = isset($details[$i]) ? $details[$i] : NULL;
 		}
 
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('INSERT INTO u_transaction_details_' . $this->getSlug() .
 				' (transaction_id, operator_id, funds_source, comment) VALUES(?,?,?,?)'))) {
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('iiss', $transaction_id, $operator_id, $funds_source, $comment)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		return TRUE;
@@ -114,31 +113,31 @@ public function storeTransactionDetails($transaction_id, $details) {
 	 *
 	 * @return mixed[]|false Retrieves array of transaction details or false if none available
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function expandTransactionDetails($transaction_id) {
 		if (is_null($transaction_id)) {
 			return FALSE;
 		}
 
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		if (!($stmt = $db->prepare('SELECT operator_id, funds_source, comment ' .
 				'FROM u_transaction_details_' . $this->getSlug() . ' ' .
 				'WHERE transaction_id = ?'))) {
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		if (!$stmt->bind_param('i', $transaction_id)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
 		}
 
 		if (!$stmt->execute()) {
-			throw new DBExecuteStmtException($db, $stmt);
+			throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 		}
 
 		if (!$stmt->bind_result($operator_id, $funds_source, $comment)) {
-			throw new DBBindResultException($db, $stmt);
+			throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 		}
 
 		$details = array();
@@ -161,7 +160,7 @@ public function expandTransactionDetails($transaction_id) {
 	 */
 	public function renderTransactionLogDetails($transaction_id) {
 		$details = $this->expandTransactionDetails($transaction_id);
-		$operator = User::getUser($details['operator_id']);
+		$operator = \StartupAPI\User::getUser($details['operator_id']);
 		$name = is_null($operator) ? 'Unknown' : $operator->getName();
 		$source = is_null($details['funds_source']) ? 'Unknown' : $details['funds_source'];
 		$comment = is_null($details['comment']) ? '-' : $details['comment'];
diff --git a/modules/manual/admin.php b/modules/manual/admin.php
index 72654ef..01f5b8a 100644
--- a/modules/manual/admin.php
+++ b/modules/manual/admin.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI\Modules;
+
 # Ensure we are serving admin
 require_once(dirname(dirname(__DIR__)) . '/admin/admin.php');
 
@@ -135,22 +137,22 @@
 						FROM u_accounts AS a LEFT JOIN u_account_charge AS c ' .
 						'ON c.account_id = a.id WHERE engine_slug = "manual" ' . (is_null($search) ? '' : 'AND name like ? ') .
 						'GROUP BY a.id ORDER BY ' . $sortby . ' LIMIT ' . $perpage . ' OFFSET ' . $pagenumber * $perpage))) {
-					throw new DBPrepareStmtException($db);
+					throw new Exceptions\DBPrepareStmtException($db);
 				}
 
 				if (!is_null($search)) {
 					$search_like = '%' . $search . '%';
 					if (!$stmt->bind_param('s', $search_like)) {
-						throw new DBBindParamException($db, $stmt);
+						throw new Exceptions\DBBindParamException($db, $stmt);
 					}
 				}
 
 				if (!$stmt->execute()) {
-					throw new DBExecuteStmtException($db, $stmt);
+					throw new Exceptions\DBExecuteStmtException($db, $stmt);
 				}
 
 				if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $active, $balance)) {
-					throw new DBBindResultException($db, $stmt);
+					throw new Exceptions\DBBindResultException($db, $stmt);
 				}
 
 				$accounts = array();
diff --git a/modules/meetup/index.php b/modules/meetup/MeetupAuthenticationModule.php
similarity index 71%
rename from modules/meetup/index.php
rename to modules/meetup/MeetupAuthenticationModule.php
index 71d7365..1326787 100644
--- a/modules/meetup/index.php
+++ b/modules/meetup/MeetupAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuthModule.php');
+namespace StartupAPI\Modules;
 
 /**
  * Meetup authentication module
@@ -9,9 +9,9 @@
  * @package StartupAPI
  * @subpackage Authentication\Meetup
  */
-class MeetupAuthenticationModule extends OAuthAuthenticationModule
+class MeetupAuthenticationModule extends \StartupAPI\OAuthAuthenticationModule
 {
-	protected $userCredentialsClass = 'MeetupUserCredentials';
+	protected $userCredentialsClass = '\StartupAPI\Modules\MeetupAuthenticationModule\MeetupUserCredentials';
 
 	/**
 	 * Instantiates Meetup authentication module and registers it with the system
@@ -32,9 +32,9 @@ public function __construct($oAuthConsumerKey, $oAuthConsumerSecret, $oAuthScope
 			'http://www.meetup.com/authenticate/',
 			array('HMAC-SHA1', 'PLAINTEXT'),
 			$oAuthScope,
-			UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/meetup/login-button.png',
 			array(
 				array(2001, "Logged in using Meetup account", 1),
 				array(2002, "Added Meetup account", 1),
@@ -69,7 +69,7 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/meetup/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/meetup/images/logo_100x.png';
 		}
 	}
 
@@ -79,7 +79,7 @@ public static function getSignupURL() {
 
 	public function getIdentity($oauth_user_id) {
 		// get meetup user id
-		$request = new OAuthRequester('https://api.meetup.com/members.json/?relation=self', 'GET');
+		$request = new \OAuthRequester('https://api.meetup.com/members.json/?relation=self', 'GET');
 		$result = $request->doRequest($oauth_user_id);
 
 		if ($result['code'] == 200) {
@@ -102,18 +102,9 @@ protected function renderUserInfo($serialized_userinfo) {
 			$template_info = array();
 		}
 
-		return StartupAPI::$template->render("@startupapi/modules/meetup/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * Meetup user credentials class
- *
- * @package StartupAPI
- * @subpackage Authentication\Meetup
- */
-class MeetupUserCredentials extends OAuthUserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/meetup/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/meetup/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/meetup/MeetupAuthenticationModule/MeetupUserCredentials.php b/modules/meetup/MeetupAuthenticationModule/MeetupUserCredentials.php
new file mode 100644
index 0000000..f228f6f
--- /dev/null
+++ b/modules/meetup/MeetupAuthenticationModule/MeetupUserCredentials.php
@@ -0,0 +1,14 @@
+<?php
+namespace StartupAPI\Modules\MeetupAuthenticationModule;
+
+/**
+ * Meetup user credentials class
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Meetup
+ */
+class MeetupUserCredentials extends \StartupAPI\OAuthUserCredentials {
+	public function getHTML() {
+		return StartupAPI::$template->render("@startupapi/modules/meetup/credentials.html.twig", $this->userinfo);
+	}
+}
diff --git a/modules/ohloh/images/logo_100x.png b/modules/ohloh/images/logo_100x.png
deleted file mode 100644
index dbce513..0000000
Binary files a/modules/ohloh/images/logo_100x.png and /dev/null differ
diff --git a/modules/ohloh/index.php b/modules/ohloh/index.php
deleted file mode 100644
index c97586e..0000000
--- a/modules/ohloh/index.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-require_once(dirname(dirname(__DIR__)) . '/classes/OAuthModule.php');
-
-/**
- * Ohloh authentication module
- *
- * Provides authentication using Ohloh.com accounts and API access using OAuth
- *
- * @package StartupAPI
- * @subpackage Authentication\Ohloh
- */
-class OhlohAuthenticationModule extends OAuthAuthenticationModule {
-
-	protected $userCredentialsClass = 'OhlohUserCredentials';
-
-	/**
-	 * Instantiates Ohloh authentication module and registers it with the system
-	 *
-	 * @param string $oAuthConsumerKey OAuth Consumer Key
-	 * @param string $oAuthConsumerSecret OAuth Consumer Secret
-	 */
-	public function __construct($oAuthConsumerKey, $oAuthConsumerSecret) {
-		parent::__construct(
-			'Ohloh',
-			'http://www.ohloh.com',
-			$oAuthConsumerKey,
-			$oAuthConsumerSecret,
-			'http://www.ohloh.net/oauth/request_token',
-			'https://api.twitter.com/oauth/access_token',
-			'http://www.ohloh.net/oauth/access_token',
-			array('HMAC-SHA1'),
-			'http://www.ohloh.com',
-			null,
-			null,
-			null,
-#			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
-#			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
-#			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
-			array(
-				array(5001, "Logged in using Ohloh account", 1),
-				array(5002, "Added Ohloh account", 1),
-				array(5003, "Removed Ohloh account", 0),
-				array(5004, "Registered using Ohloh account", 1),
-			)
-		);
-	}
-
-	public function getID() {
-		return "ohloh";
-	}
-
-	public function getLegendColor() {
-		return "868686";
-	}
-
-	public static function getModulesTitle() {
-		return "Ohloh";
-	}
-
-	public function getIdentity($oauth_user_id) {
-		// get twitter handle
-		$request = new OAuthRequester('http://www.ohloh.net/accounts/me.xml', 'GET');
-		$result = $request->doRequest($oauth_user_id);
-
-		if ($result['code'] == 200) {
-			$raw_xml = $result['body'];
-			$xml = new SimpleXMLElement($raw_xml);
-
-			// todo add more fields
-			return array(
-				'id' => (string) $xml->id,
-				'name' => (string) $xml->name
-			);
-		}
-
-		return null;
-	}
-
-	public static function getModulesDescription() {
-		return <<<EOF
-			<p>Ohloh authentication module</p>
-			<p>Provides authentication using Ohloh.com accounts and API access using OAuth</p>
-EOF;
-	}
-
-	public function getDescription() {
-		return self::getModulesDescription();
-	}
-
-	public static function getModulesLogo($size = 100) {
-		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/ohloh/images/logo_100x.png';
-		}
-	}
-
-	public static function getSignupURL() {
-		return 'https://www.ohloh.net/accounts/me/api_keys/new';
-	}
-
-	protected function renderUserInfo($serialized_userinfo) {
-		$template_info = unserialize($serialized_userinfo);
-		if (!is_array($template_info)) {
-			$template_info = array();
-		}
-
-		return StartupAPI::$template->render("@startupapi/modules/ohloh/user_info.html.twig", $template_info);
-	}
-
-}
-
-/**
- * Ohloh user credentials class
- *
- * @package StartupAPI
- * @subpackage Authentication\Ohloh
- */
-class OhlohUserCredentials extends OAuthUserCredentials {
-
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/ohloh/credentials.html.twig", $this->userinfo);
-	}
-
-}
diff --git a/modules/stripe/index.php b/modules/stripe/StripePaymentEngine.php
similarity index 83%
rename from modules/stripe/index.php
rename to modules/stripe/StripePaymentEngine.php
index db49edb..60bdf03 100644
--- a/modules/stripe/index.php
+++ b/modules/stripe/StripePaymentEngine.php
@@ -1,14 +1,13 @@
 <?php
+namespace StartupAPI\Modules;
 
 /**
+ * Payment engine using Stripe.com service
+ *
  * @package StartupAPI
  * @subpackage Subscriptions/Stripe
  */
-
-/**
- * Payment engine using Stripe.com service
- */
-class StripePaymentEngine extends PaymentEngine {
+class StripePaymentEngine extends \StartupAPI\PaymentEngine {
 
 	/**
 	 * @var boolean Singleton flag
@@ -40,7 +39,7 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/stripe/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/stripe/images/logo_100x.png';
 		}
 	}
 
@@ -76,7 +75,7 @@ public function changeSubscription($account_id, $plan_slug, $schedule_slug) {
 	 *
 	 * @return boolean True if transaction details were successfully recorded
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function storeTransactionDetails($transaction_id, $details) {
 
@@ -89,15 +88,15 @@ public function storeTransactionDetails($transaction_id, $details) {
 
 		  if (!($stmt = $db->prepare('INSERT INTO u_transaction_details_' . $this->getSlug() .
 		  ' (transaction_id, funds_source, comment) VALUES(?,?,?,?)'))) {
-		  throw new DBPrepareStmtException($db);
+		  throw new Exceptions\DBPrepareStmtException($db);
 		  }
 
 		  if (!$stmt->bind_param('iiss', $transaction_id, $operator_id, $funds_source, $comment)) {
-		  throw new DBBindParamException($db, $stmt);
+		  throw new Exceptions\DBBindParamException($db, $stmt);
 		  }
 
 		  if (!$stmt->execute()) {
-		  throw new DBExecuteStmtException($db, $stmt);
+		  throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		  }
 		 */
 
@@ -111,7 +110,7 @@ public function storeTransactionDetails($transaction_id, $details) {
 	 *
 	 * @return mixed[]|false Retrieves array of transaction details or false if none available
 	 *
-	 * @throws DBException
+	 * @throws Exceptions\DBException
 	 */
 	public function expandTransactionDetails($transaction_id) {
 		if (is_null($transaction_id)) {
@@ -125,19 +124,19 @@ public function expandTransactionDetails($transaction_id) {
 
 		  if (!($stmt = $db->prepare('SELECT operator_id, funds_source, comment FROM u_transaction_details_' . $this->getSlug() .
 		  ' WHERE transaction_id = ?'))) {
-		  throw new DBPrepareStmtException($db);
+		  throw new Exceptions\DBPrepareStmtException($db);
 		  }
 
 		  if (!$stmt->bind_param('i', $transaction_id)) {
-		  throw new DBBindParamException($db, $stmt);
+		  throw new Exceptions\DBBindParamException($db, $stmt);
 		  }
 
 		  if (!$stmt->execute()) {
-		  throw new DBExecuteStmtException($db, $stmt);
+		  throw new Exceptions\DBExecuteStmtException($db, $stmt);
 		  }
 
 		  if (!$stmt->bind_result($operator_id, $funds_source, $comment)) {
-		  throw new DBBindResultException($db, $stmt);
+		  throw new Exceptions\DBBindResultException($db, $stmt);
 		  }
 
 		  $details = array();
@@ -161,7 +160,7 @@ public function expandTransactionDetails($transaction_id) {
 	 */
 	public function renderTransactionLogDetails($transaction_id) {
 		$details = $this->expandTransactionDetails($transaction_id);
-		$operator = User::getUser($details['operator_id']);
+		$operator = \StartupAPI\User::getUser($details['operator_id']);
 		$name = is_null($operator) ? 'Unknown' : $operator->getName();
 		$source = is_null($details['funds_source']) ? 'Unknown' : $details['funds_source'];
 		$comment = is_null($details['comment']) ? '-' : $details['comment'];
diff --git a/modules/stripe/admin.php b/modules/stripe/admin.php
index c1938a7..cd7c494 100644
--- a/modules/stripe/admin.php
+++ b/modules/stripe/admin.php
@@ -135,22 +135,22 @@
         'FROM u_accounts AS a LEFT JOIN u_account_charge AS c '.
         'ON c.account_id = a.id WHERE engine_slug = "PaymentEngine_Manual" '.(is_null($search) ? '' : 'AND name like ? ').
         'GROUP BY a.id ORDER BY '.$sortby.' LIMIT '.$perpage.' OFFSET '.$pagenumber * $perpage))) {
-			throw new DBPrepareStmtException($db);
+			throw new Exceptions\DBPrepareStmtException($db);
 		}
 
       if(!is_null($search)) {
         $search_like = '%'.$search.'%';
         if (!$stmt->bind_param('s',$search_like)) {
-			throw new DBBindParamException($db, $stmt);
+			throw new Exceptions\DBBindParamException($db, $stmt);
 		}
       }
 
       if (!$stmt->execute()) {
-		throw new DBExecuteStmtException($db, $stmt);
+		throw new Exceptions\DBExecuteStmtException($db, $stmt);
 	  }
 
       if (!$stmt->bind_result($id, $name, $plan_slug, $schedule_slug, $active, $balance)) {
-		throw new DBBindResultException($db, $stmt);
+		throw new Exceptions\DBBindResultException($db, $stmt);
 	  }
 
       $accounts = array();
diff --git a/modules/twitter/index.php b/modules/twitter/TwitterAuthenticationModule.php
similarity index 73%
rename from modules/twitter/index.php
rename to modules/twitter/TwitterAuthenticationModule.php
index 9defe36..7f58aa6 100644
--- a/modules/twitter/index.php
+++ b/modules/twitter/TwitterAuthenticationModule.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(dirname(__DIR__)).'/classes/OAuthModule.php');
+namespace StartupAPI\Modules;
 
 /**
  * Twitter authentication module
@@ -10,9 +10,8 @@
  * @package StartupAPI
  * @subpackage Authentication\Twitter
  */
-class TwitterAuthenticationModule extends OAuthAuthenticationModule
-{
-	protected $userCredentialsClass = 'TwitterUserCredentials';
+class TwitterAuthenticationModule extends \StartupAPI\OAuthAuthenticationModule {
+	protected $userCredentialsClass = '\StartupAPI\Modules\TwitterAuthenticationModule\TwitterUserCredentials';
 
 	/**
 	 * Instantiates Twitter authentication module and registers it with the system
@@ -32,9 +31,9 @@ public function __construct($oAuthConsumerKey, $oAuthConsumerSecret)
 			'https://api.twitter.com/oauth/authenticate',
 			array('HMAC-SHA1'),
 			'http://api.twitter.com',
-			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
-			UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
+			\StartupAPI\UserConfig::$USERSROOTURL.'/modules/twitter/login-button.png',
 			array(
 				array(4001, "Logged in using Twitter account", 1),
 				array(4002, "Added Twitter account", 1),
@@ -69,7 +68,7 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/twitter/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/twitter/images/logo_100x.png';
 		}
 	}
 
@@ -79,7 +78,7 @@ public static function getSignupURL() {
 
 	public function getIdentity($oauth_user_id) {
 		// get twitter handle
-		$request = new OAuthRequester('https://api.twitter.com/1.1/account/verify_credentials.json', 'GET');
+		$request = new \OAuthRequester('https://api.twitter.com/1.1/account/verify_credentials.json', 'GET');
 		$result = $request->doRequest($oauth_user_id);
 
 		if ($result['code'] == 200) {
@@ -117,18 +116,9 @@ protected function renderUserInfo($serialized_userinfo) {
 		if (!is_array($template_info)) {
 			$template_info = array();
 		}
-		return StartupAPI::$template->render("@startupapi/modules/twitter/user_info.html.twig", $template_info);
-	}
-}
-
-/**
- * Twitter user credentials
- *
- * @package StartupAPI
- * @subpackage Authentication\Twitter
- */
-class TwitterUserCredentials extends OAuthUserCredentials {
-	public function getHTML() {
-		return StartupAPI::$template->render("@startupapi/modules/twitter/credentials.html.twig", $this->userinfo);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/twitter/user_info.html.twig",
+			$template_info
+		);
 	}
 }
diff --git a/modules/twitter/TwitterAuthenticationModule/TwitterUserCredentials.php b/modules/twitter/TwitterAuthenticationModule/TwitterUserCredentials.php
new file mode 100644
index 0000000..9a29c17
--- /dev/null
+++ b/modules/twitter/TwitterAuthenticationModule/TwitterUserCredentials.php
@@ -0,0 +1,14 @@
+<?php
+namespace StartupAPI\Modules\TwitterAuthenticationModule;
+
+/**
+ * Twitter user credentials
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\Twitter
+ */
+class TwitterUserCredentials extends \StartupAPI\OAuthUserCredentials {
+	public function getHTML() {
+		return StartupAPI::$template->render("@startupapi/modules/twitter/credentials.html.twig", $this->userinfo);
+	}
+}
diff --git a/modules/usernamepass/index.php b/modules/usernamepass/UsernamePasswordAuthenticationModule.php
similarity index 78%
rename from modules/usernamepass/index.php
rename to modules/usernamepass/UsernamePasswordAuthenticationModule.php
index e040b83..6fc71d5 100644
--- a/modules/usernamepass/index.php
+++ b/modules/usernamepass/UsernamePasswordAuthenticationModule.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI\Modules;
+
 /**
  * Basic authentication module using username and password
  *
@@ -10,7 +12,7 @@
  * @package StartupAPI
  * @subpackage Authentication\UsernamePassword
  */
-class UsernamePasswordAuthenticationModule extends AuthenticationModule
+class UsernamePasswordAuthenticationModule extends \StartupAPI\AuthenticationModule
 {
 	public function getID()
 	{
@@ -40,13 +42,13 @@ public function getDescription() {
 
 	public static function getModulesLogo($size = 100) {
 		if ($size == 100) {
-			return UserConfig::$USERSROOTURL . '/modules/usernamepass/images/logo_100x.png';
+			return \StartupAPI\UserConfig::$USERSROOTURL . '/modules/usernamepass/images/logo_100x.png';
 		}
 	}
 
 	public function getUserCredentials($user)
 	{
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$userid = $user->getID();
 
@@ -54,15 +56,15 @@ public function getUserCredentials($user)
 		{
 			if (!$stmt->bind_param('i', $userid))
 			{
-				throw new DBBindParamException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindParamException($db, $stmt);
 			}
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($username))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -73,12 +75,12 @@ public function getUserCredentials($user)
 			// (don't reset the flag if was was set for some other reasons)
 			if (!is_null($username))
 			{
-				return new UsernamePassUserCredentials($username);
+				return new UsernamePasswordAuthenticationModule\UsernamePassUserCredentials($username);
 			}
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return null;
@@ -86,7 +88,7 @@ public function getUserCredentials($user)
 
 	public function getTotalConnectedUsers()
 	{
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$conns = 0;
 
@@ -94,11 +96,11 @@ public function getTotalConnectedUsers()
 		{
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($conns))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			$stmt->fetch();
@@ -106,7 +108,7 @@ public function getTotalConnectedUsers()
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $conns;
@@ -116,7 +118,7 @@ public function getTotalConnectedUsers()
 	 */
 	public function getDailyRegistrations()
 	{
-		$db = UserConfig::getDB();
+		$db = \StartupAPI\UserConfig::getDB();
 
 		$dailyregs = array();
 
@@ -124,11 +126,11 @@ public function getDailyRegistrations()
 		{
 			if (!$stmt->execute())
 			{
-				throw new DBExecuteStmtException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBExecuteStmtException($db, $stmt);
 			}
 			if (!$stmt->bind_result($regdate, $regs))
 			{
-				throw new DBBindResultException($db, $stmt);
+				throw new \StartupAPI\Exceptions\DBBindResultException($db, $stmt);
 			}
 
 			while($stmt->fetch() === TRUE)
@@ -140,7 +142,7 @@ public function getDailyRegistrations()
 		}
 		else
 		{
-			throw new DBPrepareStmtException($db);
+			throw new \StartupAPI\Exceptions\DBPrepareStmtException($db);
 		}
 
 		return $dailyregs;
@@ -150,7 +152,10 @@ public function renderLoginForm($template_info, $action)
 	{
 		$template_info['slug'] = $this->getID();
 		$template_info['action'] = $action;
-		return StartupAPI::$template->render("@startupapi/modules/usernamepass/login_form.html.twig", $template_info);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/usernamepass/login_form.html.twig",
+			$template_info
+		);
 	}
 
 	public function renderRegistrationForm($template_info, $full = false, $action = null, $errors = null, $data = null)
@@ -161,7 +166,10 @@ public function renderRegistrationForm($template_info, $full = false, $action =
 		$template_info['errors'] = $errors;
 		$template_info['data'] = $data;
 
-		return StartupAPI::$template->render("@startupapi/modules/usernamepass/registration_form.html.twig", $template_info);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/usernamepass/registration_form.html.twig",
+			$template_info
+		);
 	}
 
 	public function renderEditUserForm($template_info, $action, $errors, $user, $data)
@@ -171,14 +179,17 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
 		$template_info['errors'] = $errors;
 		$template_info['data'] = $data;
 
-		return StartupAPI::$template->render("@startupapi/modules/usernamepass/edit_user_form.html.twig", $template_info);
+		return \StartupAPI\StartupAPI::$template->render(
+			"@startupapi/modules/usernamepass/edit_user_form.html.twig",
+			$template_info
+		);
 	}
 
 	public function processLogin($data, &$remember)
 	{
-		$remember = UserConfig::$allowRememberMe && array_key_exists('remember', $data);
+		$remember = \StartupAPI\UserConfig::$allowRememberMe && array_key_exists('remember', $data);
 
-		$user = User::getUserByUsernamePassword($data['username'], $data['pass']);
+		$user = \StartupAPI\User::getUserByUsernamePassword($data['username'], $data['pass']);
 
 		if (!is_null($user))
 		{
@@ -190,7 +201,8 @@ public function processLogin($data, &$remember)
 
 	public function processRegistration($data, &$remember)
 	{
-		$remember = UserConfig::$allowRememberMe && UserConfig::$rememberUserOnRegistration;
+		$remember = \StartupAPI\UserConfig::$allowRememberMe &&
+			\StartupAPI\UserConfig::$rememberUserOnRegistration;
 
 		$errors = array();
 		if (array_key_exists('pass', $data) && array_key_exists('repeatpass', $data) && $data['pass'] !== $data['repeatpass'])
@@ -256,23 +268,25 @@ public function processRegistration($data, &$remember)
 
 		if (count($errors) > 0)
 		{
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\InputValidationException(
+				'Validation failed', 0, $errors
+			);
 		}
 
-		if (count(User::getUsersByEmailOrUsername($username)) > 0 ) {
+		if (count(\StartupAPI\User::getUsersByEmailOrUsername($username)) > 0 ) {
 			$errors['username'][] = "This username is already used, please pick another one";
 		}
-		if (count(User::getUsersByEmailOrUsername($email)) > 0 ) {
+		if (count(\StartupAPI\User::getUsersByEmailOrUsername($email)) > 0 ) {
 			$errors['email'][] = "This email is already used by another user, please enter another email address.";
 		}
 
 		if (count($errors) > 0)
 		{
-			throw new ExistingUserException('User already exists', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\ExistingUserException('User already exists', 0, $errors);
 		}
 
 		// ok, let's create a user
-		$user = User::createNew($name, $username, $email, $data['pass']);
+		$user = \StartupAPI\User::createNew($name, $username, $email, $data['pass']);
 		$user->recordActivity(USERBASE_ACTIVITY_REGISTER_UPASS);
 		return $user;
 	}
@@ -316,7 +330,7 @@ public function processEditUser($user, $data)
 			}
 
 			if (!is_null($username)) {
-				$existing_users = User::getUsersByEmailOrUsername($username);
+				$existing_users = \StartupAPI\User::getUsersByEmailOrUsername($username);
 				if (!array_key_exists('username', $errors) &&
 					(count($existing_users) > 0 && !$existing_users[0]->isTheSameAs($user))
 				) {
@@ -378,7 +392,7 @@ public function processEditUser($user, $data)
 
 		if (count($errors) > 0)
 		{
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\InputValidationException('Validation failed', 0, $errors);
 		}
 
 		if ($changepass)
@@ -436,7 +450,9 @@ public function processUpdatePassword($user, $data)
 
 		if (count($errors) > 0)
 		{
-			throw new InputValidationException('Validation failed', 0, $errors);
+			throw new \StartupAPI\Exceptions\Authentication\InputValidationException(
+				'Validation failed', 0, $errors
+			);
 		}
 
 		$user->setPass($data['pass']);
@@ -462,38 +478,3 @@ public function processUpdatePassword($user, $data)
 	 */
 	public static $IGNORE_PASSWORD_RESET = false;
 }
-
-/**
- * Username credentials
- *
- * @package StartupAPI
- * @subpackage Authentication\UsernamePassword
- */
-class UsernamePassUserCredentials extends UserCredentials {
-	/**
-	 * @var string Username
-	 */
-	private $username;
-
-	/**
-	 * Creates Username credentials object
-	 *
-	 * @param type $username
-	 */
-	public function __construct($username) {
-		$this->username = $username;
-	}
-
-	/**
-	 * Returns user's username
-	 *
-	 * @return string Username
-	 */
-	public function getUsername() {
-		return $this->username;
-	}
-
-	public function getHTML() {
-		return $this->username;
-	}
-}
diff --git a/modules/usernamepass/UsernamePasswordAuthenticationModule/UsernamePassUserCredentials.php b/modules/usernamepass/UsernamePasswordAuthenticationModule/UsernamePassUserCredentials.php
new file mode 100644
index 0000000..4105612
--- /dev/null
+++ b/modules/usernamepass/UsernamePasswordAuthenticationModule/UsernamePassUserCredentials.php
@@ -0,0 +1,37 @@
+<?php
+namespace StartupAPI\Modules\UsernamePasswordAuthenticationModule;
+
+/**
+ * Username credentials
+ *
+ * @package StartupAPI
+ * @subpackage Authentication\UsernamePassword
+ */
+class UsernamePassUserCredentials extends \StartupAPI\UserCredentials {
+	/**
+	 * @var string Username
+	 */
+	private $username;
+
+	/**
+	 * Creates Username credentials object
+	 *
+	 * @param type $username
+	 */
+	public function __construct($username) {
+		$this->username = $username;
+	}
+
+	/**
+	 * Returns user's username
+	 *
+	 * @return string Username
+	 */
+	public function getUsername() {
+		return $this->username;
+	}
+
+	public function getHTML() {
+		return $this->username;
+	}
+}
diff --git a/modules/usernamepass/forgotpassword.php b/modules/usernamepass/forgotpassword.php
index 17796fe..5b8ebff 100644
--- a/modules/usernamepass/forgotpassword.php
+++ b/modules/usernamepass/forgotpassword.php
@@ -41,7 +41,7 @@
 
 		exit;
 	} else {
-		throw new StartupAPIException('Can\'t render temporary password email, check if UserConfig::$onRenderTemporaryPasswordEmail is set');
+		throw new Exceptions\StartupAPIException('Can\'t render temporary password email, check if UserConfig::$onRenderTemporaryPasswordEmail is set');
 	}
 }
 
diff --git a/navbox.php b/navbox.php
index 6e598d7..a7ce55e 100644
--- a/navbox.php
+++ b/navbox.php
@@ -1 +1,4 @@
-<?php StartupAPI::power_strip();
+<?php
+namespace StartupAPI;
+
+StartupAPI::power_strip();
diff --git a/oauth2_callback.php b/oauth2_callback.php
index 5a706b4..9cb4bec 100644
--- a/oauth2_callback.php
+++ b/oauth2_callback.php
@@ -1,20 +1,21 @@
 <?php
+namespace StartupAPI;
+
 /**
  * OAuth2 callback script used by all modules that subclass OAuth2Module
  */
 require_once(__DIR__.'/global.php');
-require_once(__DIR__.'/classes/User.php');
 
 $current_user = User::get();
 
 try
 {
 	if (!array_key_exists('module', $_GET)) {
-		throw new StartupAPIException('module not specified');
+		throw new Exceptions\StartupAPIException('module not specified');
 	}
 
 	if (!array_key_exists('code', $_GET)) {
-		throw new StartupAPIException('OAuth2 "code" parameter required');
+		throw new Exceptions\StartupAPIException('OAuth2 "code" parameter required');
 	}
 
 	$module = AuthenticationModule::get($_GET['module']);
@@ -24,22 +25,22 @@
 	{
 		$oauth2_client_id = $module->getOAuth2ClientIDByCode($_GET['code']);
 	}
-	catch (OAuth2Exception $e)
+	catch (Exceptions\OAuth2Exception $e)
 	{
-		throw new StartupAPIException('Problem getting access token: '.$e->getMessage());
+		throw new Exceptions\StartupAPIException('Problem getting access token: '.$e->getMessage());
 	}
 
 	try
 	{
 		$identity = $module->getIdentity($oauth2_client_id);
 	}
-	catch (OAuth2Exception $e)
+	catch (Exceptions\OAuth2Exception $e)
 	{
-		throw new StartupAPIException('Problem getting user identity: '.$e->getMessage());
+		throw new Exceptions\StartupAPIException('Problem getting user identity: '.$e->getMessage());
 	}
 
 	if (is_null($identity)) {
-		throw new StartupAPIException('No identity returned');
+		throw new Exceptions\StartupAPIException('No identity returned');
 	}
 
 	UserTools::debug("Current User: " . var_export($current_user, true));
@@ -70,7 +71,7 @@
 	} else {
 		// otherwise, we're adding their credential to an existing user
 		if (!is_null($user)) {
-			throw new StartupAPIException('Another user is already connected with this account');
+			throw new Exceptions\StartupAPIException('Another user is already connected with this account');
 		}
 
 		$module->addUserOAuth2Identity($current_user, $identity, $oauth2_client_id);
diff --git a/oauth_callback.php b/oauth_callback.php
index ea5e6ec..95cc9ab 100644
--- a/oauth_callback.php
+++ b/oauth_callback.php
@@ -1,9 +1,10 @@
 <?php
+namespace StartupAPI;
+
 /**
  * OAuth callback script used by all modules that subclass OAuthModule
  */
 require_once(__DIR__.'/global.php');
-require_once(__DIR__.'/classes/User.php');
 
 $current_user = User::get();
 
@@ -12,11 +13,11 @@
 try
 {
 	if (!array_key_exists('module', $_GET)) {
-		throw new StartupAPIException('module not specified');
+		throw new Exceptions\StartupAPIException('module not specified');
 	}
 
 	if (!array_key_exists('oauth_token', $_GET) || !array_key_exists('oauth_verifier', $_GET)) {
-		throw new StartupAPIException('oauth_token & oauth_varifier required');
+		throw new Exceptions\StartupAPIException('oauth_token & oauth_varifier required');
 	}
 
 	$module = AuthenticationModule::get($_GET['module']);
@@ -32,7 +33,7 @@
 	$storage->delete(UserConfig::$oauth_user_id_key);
 
 	if (is_null($oauth_user_id)) {
-		throw new StartupAPIException("can't determine OAuth User ID");
+		throw new Exceptions\StartupAPIException("can't determine OAuth User ID");
 	}
 
 	try
@@ -41,7 +42,7 @@
 	}
 	catch (OAuthException2 $e)
 	{
-		throw new StartupAPIException('problem getting access token: '.$e->getMessage());
+		throw new Exceptions\StartupAPIException('problem getting access token: '.$e->getMessage());
 	}
 
 	try
@@ -50,11 +51,11 @@
 	}
 	catch (OAuthException2 $e)
 	{
-		throw new StartupAPIException('problem getting user identity: '.$e->getMessage());
+		throw new Exceptions\StartupAPIException('problem getting user identity: '.$e->getMessage());
 	}
 
 	if (is_null($identity)) {
-		throw new StartupAPIException('no identity returned');
+		throw new Exceptions\StartupAPIException('no identity returned');
 	}
 
 	#error_log(
@@ -85,7 +86,7 @@
 	} else {
 		// otherwise, we're adding their credential to an existing user
 		if (!is_null($user)) {
-			throw new StartupAPIException('another user is already connected with this account');
+			throw new Exceptions\StartupAPIException('another user is already connected with this account');
 		}
 
 		$module->addUserOAuthIdentity($current_user, $identity, $oauth_user_id);
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 8d9554c..718f2a7 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -12,7 +12,6 @@
 	</transformations>
 	<files>
 		<directory>.</directory>
-		<ignore>CookieStorage.php</ignore>
 		<ignore>oauth-php/*</ignore>
 		<ignore>modules/facebook/facebook-php-sdk/*</ignore>
 		<ignore>dbupgrade/*</ignore>
@@ -21,6 +20,8 @@
 		<ignore>twig/*</ignore>
 		<ignore>cache/*</ignore>
 		<ignore>phptidy/*</ignore>
-		<ignore>CookieStorage.php</ignore>
+		<ignore>MrClay_CookieStorage.php</ignore>
+		<ignore>swiftmailer/*</ignore>
+		<ignore>php-bootstrap/*</ignore>
 	</files>
 </phpdoc>
diff --git a/plans.php b/plans.php
index 82d8e24..f4c90ba 100644
--- a/plans.php
+++ b/plans.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
@@ -52,15 +53,15 @@
 	try {
 		// Check if plan and schedule exists
 		if (!($plan = Plan::getPlanBySlug($selected_plan_slug))) {
-			throw new Exception("Unknown plan '" . $selected_plan_slug . '"');
+			throw new Exceptions\StartupAPIException("Unknown plan '" . $selected_plan_slug . '"');
 		}
 
 		if (!is_null($selected_schedule_slug) && !($schedule = $plan->getPaymentScheduleBySlug($selected_schedule_slug))) {
-			throw new Exception("Unknown schedule '" . $selected_schedule_slug . "' for plan '" . $selected_plan_slug . "'");
+			throw new Exceptions\StartupAPIException("Unknown schedule '" . $selected_schedule_slug . "' for plan '" . $selected_plan_slug . "'");
 		}
 
 		if (!is_null($selected_engine_slug) && !($engine = PaymentEngine::getEngineBySlug($selected_engine_slug))) {
-			throw new Exception("Unknown payment engine '" . $engine . "' for schedule schedule '" . $selected_schedule_slug . "' for plan '" . $selected_plan_slug . "'");
+			throw new Exceptions\StartupAPIException("Unknown payment engine '" . $engine . "' for schedule schedule '" . $selected_schedule_slug . "' for plan '" . $selected_plan_slug . "'");
 		}
 	} catch (Exception $e) {
 		$_SESSION['message'][] = $e->getMessage();
diff --git a/register.php b/register.php
index 0100b78..2f95913 100644
--- a/register.php
+++ b/register.php
@@ -1,10 +1,8 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
-require_once(__DIR__ . '/classes/User.php');
-require_once(__DIR__ . '/classes/Invitation.php');
-
 $errors = array();
 
 $user_exists = false;
@@ -13,13 +11,13 @@
 	$module = AuthenticationModule::get($_GET['module']);
 
 	if (is_null($module)) {
-		throw new StartupAPIException('Wrong module specified');
+		throw new Exceptions\StartupAPIException('Wrong module specified');
 	}
 
 	$invitation = null;
 
 	if (UserConfig::$adminInvitationOnly && !array_key_exists('invite', $_GET)) {
-		throw new StartupAPIException('Invitation code is not submitted');
+		throw new Exceptions\StartupAPIException('Invitation code is not submitted');
 	}
 
 	if ((UserConfig::$enableUserInvitations || UserConfig::$adminInvitationOnly)
@@ -28,7 +26,7 @@
 		$invitation = Invitation::getByCode($code);
 
 		if (is_null($invitation) || $invitation->getStatus()) {
-			throw new StartupAPIException('Invitation code is invalid');
+			throw new Exceptions\StartupAPIException('Invitation code is invalid');
 		}
 
 		$_SESSION[UserConfig::$invitation_code_key] = $code;
@@ -54,9 +52,9 @@
 		}
 
 		exit;
-	} catch (InputValidationException $ex) {
+	} catch (Exceptions\Authentication\InputValidationException $ex) {
 		$errors[$module->getID()] = $ex->getErrors();
-	} catch (ExistingUserException $ex) {
+	} catch (Exceptions\Authentication\ExistingUserException $ex) {
 		$user_exists = true;
 		$errors[$module->getID()] = $ex->getErrors();
 	}
diff --git a/sample.php b/sample.php
index 05dd1b9..9ee6f76 100644
--- a/sample.php
+++ b/sample.php
@@ -4,7 +4,7 @@
 /**
  * Get User object or null if user is not logged in
  */
-$current_user = StartupAPI::getUser();
+$current_user = \StartupAPI\StartupAPI::getUser();
 
 /**
  * Get User object or redirect to login page if user is not logged in
@@ -14,19 +14,19 @@
 // You can work with users, but it's recommended to work with accounts instead
 if (!is_null($current_user)) {
 	// if user is logged in, get user's accounts
-	$accounts = Account::getUserAccounts($current_user);
+	$accounts = \StartupAPI\Account::getUserAccounts($current_user);
 
 	// get current account user works with
-	$current_account = Account::getCurrentAccount($current_user);
+	$current_account = \StartupAPI\Account::getCurrentAccount($current_user);
 }
 ?>
 <html>
 <head>
 	<title>Sample page</title>
-	<?php StartupAPI::head() ?>
+	<?php \StartupAPI\StartupAPI::head() ?>
 </head>
 <body>
-<?php StartupAPI::power_strip() ?>
+<?php \StartupAPI\StartupAPI::power_strip() ?>
 <?php
 
 if (!is_null($current_user)) {
@@ -41,7 +41,7 @@
 ?>
 <h1>Welcome!</h1>
 
-<p><a href="<?php echo UserConfig::$USERSROOTURL ?>/login.php">Log in</a> to enjoy the magic.</p>
+<p><a href="<?php echo \StartupAPI\UserConfig::$USERSROOTURL ?>/login.php">Log in</a> to enjoy the magic.</p>
 <?php
 }
 ?>
diff --git a/send_email_verification_code.php b/send_email_verification_code.php
index ed317b9..947ab1a 100644
--- a/send_email_verification_code.php
+++ b/send_email_verification_code.php
@@ -1,7 +1,7 @@
 <?php
-require_once(__DIR__ . '/global.php');
+namespace StartupAPI;
 
-require_once(__DIR__ . '/classes/User.php');
+require_once(__DIR__ . '/global.php');
 
 UserConfig::$IGNORE_REQUIRED_EMAIL_VERIFICATION = true;
 
diff --git a/show_badge.php b/show_badge.php
index 1c6872e..3219ec7 100644
--- a/show_badge.php
+++ b/show_badge.php
@@ -1,7 +1,7 @@
 <?php
-require_once(__DIR__ . '/global.php');
+namespace StartupAPI;
 
-require_once(__DIR__ . '/classes/User.php');
+require_once(__DIR__ . '/global.php');
 
 if (!UserConfig::$enableGamification || !array_key_exists('name', $_GET)) {
 	header('Location: ' . UserConfig::$USERSROOTURL . '/badges.php');
diff --git a/subscription_details.php b/subscription_details.php
index 3383623..ab91e14 100644
--- a/subscription_details.php
+++ b/subscription_details.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/global.php');
 
 if (!UserConfig::$useSubscriptions) {
diff --git a/tests/TestClock.php b/tests/TestClock.php
index 43526b4..1954b46 100644
--- a/tests/TestClock.php
+++ b/tests/TestClock.php
@@ -1,10 +1,14 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)).'/simpletest/autorun.php');
 
 require_once(dirname(__DIR__).'/users.php');
 require_once(dirname(__DIR__).'/classes/Clock.php');
 
+/**
+ * @package StartupAPI
+ */
 class TestClock extends UnitTestCase {
 
   function testRealClock()
diff --git a/tests/TestPaymentEngine.php b/tests/TestPaymentEngine.php
index af987e0..4559ff3 100644
--- a/tests/TestPaymentEngine.php
+++ b/tests/TestPaymentEngine.php
@@ -1,9 +1,13 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)).'/simpletest/autorun.php');
 
 require_once(dirname(__DIR__).'/users.php');
 
+/**
+ * @package StartupAPI
+ */
 class TestPaymentEngine extends UnitTestCase {
   private $user = null;
 
diff --git a/tests/TestPayments.php b/tests/TestPayments.php
index 7e19877..1e190b3 100644
--- a/tests/TestPayments.php
+++ b/tests/TestPayments.php
@@ -1,9 +1,13 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)).'/simpletest/autorun.php');
 
 require_once(dirname(__DIR__).'/users.php');
 
+/**
+ * @package StartupAPI
+ */
 class TestPayments extends UnitTestCase {
   private $user = null;
 
diff --git a/tests/TestPlan.php b/tests/TestPlan.php
index a3dd63b..bfba6e0 100644
--- a/tests/TestPlan.php
+++ b/tests/TestPlan.php
@@ -1,9 +1,13 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)).'/simpletest/autorun.php');
 
 require_once(dirname(__DIR__).'/users.php');
 
+/**
+ * @package StartupAPI
+ */
 class TestSimple1 extends UnitTestCase {
   private $plan = null;
 
diff --git a/tests/TestUser.php b/tests/TestUser.php
index d0544cd..def1b5e 100644
--- a/tests/TestUser.php
+++ b/tests/TestUser.php
@@ -1,9 +1,13 @@
 <?php
+namespace StartupAPI;
 
 require_once(dirname(dirname(__DIR__)) . '/simpletest/autorun.php');
 
 require_once(dirname(__DIR__) . '/users.php');
 
+/**
+ * @package StartupAPI
+ */
 class TestUser extends UnitTestCase {
 
 	private $user = null;
diff --git a/tests/all_tests.php b/tests/all_tests.php
index b148689..6644e93 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -1,9 +1,13 @@
 <?php
+namespace StartupAPI;
 
 error_reporting(E_ALL);
 
 require_once(dirname(dirname(__DIR__)).'/simpletest/autorun.php');
 
+/**
+ * @package StartupAPI
+ */
 class AllTests extends TestSuite {
   function AllTests()
   {
@@ -15,5 +19,3 @@ function AllTests()
     $this->addFile('TestClock.php');
   }
 }
-
-?>
diff --git a/themes/awesome/templates/modules/ohloh/credentials.html.twig b/themes/awesome/templates/modules/ohloh/credentials.html.twig
deleted file mode 100644
index dd5c130..0000000
--- a/themes/awesome/templates/modules/ohloh/credentials.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<a href="http://www.ohloh.net/accounts/{{id}}" target="_blank">@{{name}}</a>'
diff --git a/themes/awesome/templates/modules/ohloh/user_info.html.twig b/themes/awesome/templates/modules/ohloh/user_info.html.twig
deleted file mode 100644
index d3fd6a5..0000000
--- a/themes/awesome/templates/modules/ohloh/user_info.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<a href="http://www.ohloh.net/accounts/{{id}}" target="_blank">{{name}}</a>
diff --git a/themes/classic/templates/modules/ohloh/credentials.html.twig b/themes/classic/templates/modules/ohloh/credentials.html.twig
deleted file mode 100644
index dd5c130..0000000
--- a/themes/classic/templates/modules/ohloh/credentials.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<a href="http://www.ohloh.net/accounts/{{id}}" target="_blank">@{{name}}</a>'
diff --git a/themes/classic/templates/modules/ohloh/user_info.html.twig b/themes/classic/templates/modules/ohloh/user_info.html.twig
deleted file mode 100644
index d3fd6a5..0000000
--- a/themes/classic/templates/modules/ohloh/user_info.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<a href="http://www.ohloh.net/accounts/{{id}}" target="_blank">{{name}}</a>
diff --git a/transaction_log.php b/transaction_log.php
index 7874cf0..c7ba3ff 100644
--- a/transaction_log.php
+++ b/transaction_log.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(__DIR__.'/global.php');
 
 if (!UserConfig::$useSubscriptions) {
diff --git a/users.php b/users.php
index 7833286..7770b21 100644
--- a/users.php
+++ b/users.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /*
  * Users.php
  *
@@ -6,10 +8,4 @@
 */
 require_once(__DIR__.'/global.php');
 
-require_once(__DIR__.'/classes/User.php');
-require_once(__DIR__.'/classes/Plan.php');
-require_once(__DIR__.'/classes/Account.php');
-require_once(__DIR__.'/classes/Cohort.php');
-require_once(__DIR__.'/classes/Feature.php');
-
 User::updateReturnActivity(); // only if user is logged in
diff --git a/users_config.localtest.php b/users_config.localtest.php
index 5824da2..0f23af1 100644
--- a/users_config.localtest.php
+++ b/users_config.localtest.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
 
 !!!! DO NOT USE THIS CONFIGURATION FILE !!!!
@@ -87,8 +89,7 @@
  * Username and password registration configuration
  * just have these lines or comment them out if you don't want regular form registration
  */
-UserConfig::loadModule('usernamepass');
-new UsernamePasswordAuthenticationModule();
+new Modules\UsernamePasswordAuthenticationModule();
 
 /**
  * Facebook Connect configuration
@@ -96,8 +97,7 @@
  * Click "Edit settings" -> "Website with Facebook Login" and enter your site's URL
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('facebook');
-#new FacebookAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
+#new Modules\FacebookAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
 
 /**
  * Twitter Authentication configuration
@@ -110,8 +110,7 @@
  *
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('twitter');
-#new TwitterAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
+#new Modules\TwitterAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
 
 /**
  * Google OAuth Authentication configuration
@@ -122,8 +121,7 @@
  * 	See up-to-date list of scopes here: http://code.google.com/apis/gdata/faq.html#AuthScopes
  *	(Google Contacts API scope is required and is included by default)
  */
-#UserConfig::loadModule('google_oauth');
-#new GoogleOAuthAuthenticationModule(
+#new Modules\GoogleOAuthAuthenticationModule(
 #	'...OAuth.key.goes.here...',
 #	'...OAuth.secret.goes.here...',
 #	array(
@@ -151,24 +149,21 @@
  * Click red "Register OAuth Consumer" button on the right and enter your site's name and URL
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('meetup');
-#new MeetupAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\MeetupAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 /**
  * LinkedIn Authentication configuration
  * Register your app here: https://www.linkedin.com/secure/developer
  * And then uncomment two lines below and copy API Key and Secret Key
  */
-#UserConfig::loadModule('linkedin');
-#new LinkedInAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\LinkedInAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 /**
  * Etsy Authentication configuration
  * Register your app here: https://www.etsy.com/developers/register
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('etsy');
-#new EtsyAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\EtsyAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 
 /* ========================================================================
@@ -189,8 +184,7 @@
  *
  * More modules to come (e.g. PayPal, Amazon & etc)
  */
-#UserConfig::loadModule('manual');
-#new ManualPaymentEngine();
+#new Modules\ManualPaymentEngine();
 
 /**
  * Configure your subscription plans  and payment schedules in addition to a default free subscription
diff --git a/users_config.sample.php b/users_config.sample.php
index c0be7bc..90030f6 100644
--- a/users_config.sample.php
+++ b/users_config.sample.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 /**
  * You must fill it in with some random string
  * this protects some of your user's data when sent over the network
@@ -72,8 +74,7 @@
  * Username and password registration configuration
  * just have these lines or comment them out if you don't want regular form registration
  */
-UserConfig::loadModule('usernamepass');
-new UsernamePasswordAuthenticationModule();
+new Modules\UsernamePasswordAuthenticationModule();
 
 /**
  * Google OAuth2 Authentication configuration
@@ -90,8 +91,7 @@
  * 	See up-to-date list of APIs and scopes here: https://developers.google.com/oauthplayground/
  *	(One of /Google Contacts API scope is required and is included by default)
  */
-#UserConfig::loadModule('google_oauth');
-#new GoogleOAuthAuthenticationModule(
+#new Modules\GoogleOAuthAuthenticationModule(
 #	'...OAuth2.client.id.goes.here...',
 #	'...OAuth2.clientsecret.goes.here...',
 #	array(
@@ -108,8 +108,7 @@
  * Click "Edit settings" -> "Website with Facebook Login" and enter your site's URL
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('facebook');
-#new FacebookAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
+#new Modules\FacebookAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
 
 /**
  * Twitter Authentication configuration
@@ -122,8 +121,7 @@
  *
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('twitter');
-#new TwitterAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
+#new Modules\TwitterAuthenticationModule('...api.key.goes.here...', '...api.secret.goes.here...');
 
 /**
  * Meetup Authentication configuration
@@ -131,24 +129,21 @@
  * Click red "Register OAuth Consumer" button on the right and enter your site's name and URL
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('meetup');
-#new MeetupAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\MeetupAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 /**
  * LinkedIn Authentication configuration
  * Register your app here: https://www.linkedin.com/secure/developer
  * And then uncomment two lines below and copy API Key and Secret Key
  */
-#UserConfig::loadModule('linkedin');
-#new LinkedInAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\LinkedInAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 /**
  * Etsy Authentication configuration
  * Register your app here: https://www.etsy.com/developers/register
  * And then uncomment two lines below and copy API Key and App Secret
  */
-#UserConfig::loadModule('etsy');
-#new EtsyAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
+#new Modules\EtsyAuthenticationModule('...OAuth.key.goes.here...', '...OAuth.secret.goes.here...');
 
 
 /* ========================================================================
@@ -169,8 +164,7 @@
  *
  * More modules to come (e.g. PayPal, Amazon & etc)
  */
-#UserConfig::loadModule('manual');
-#new ManualPaymentEngine();
+#new Modules\ManualPaymentEngine();
 
 /**
  * Configure your subscription plans  and payment schedules in addition to a default free subscription
diff --git a/verify_email.php b/verify_email.php
index ee896c0..5a51cd9 100644
--- a/verify_email.php
+++ b/verify_email.php
@@ -1,7 +1,7 @@
 <?php
-require_once(__DIR__ . '/global.php');
+namespace StartupAPI;
 
-require_once(__DIR__ . '/classes/User.php');
+require_once(__DIR__ . '/global.php');
 
 UserConfig::$IGNORE_REQUIRED_EMAIL_VERIFICATION = true;
 
diff --git a/version.php b/version.php
index cb17e59..0322b78 100644
--- a/version.php
+++ b/version.php
@@ -1,4 +1,5 @@
 <?php
+namespace StartupAPI;
 
 require_once(__DIR__ . '/global.php');
 
diff --git a/view/engine/choose_engine.php b/view/engine/choose_engine.php
index d705914..af1ae06 100644
--- a/view/engine/choose_engine.php
+++ b/view/engine/choose_engine.php
@@ -1,4 +1,6 @@
 <?php
+namespace StartupAPI;
+
 require_once(dirname(dirname(__DIR__)).'/global.php');
 
 $user = User::require_login();