diff --git a/application/core/FHC_Model.php b/application/core/FHC_Model.php
index 82e966f6f..f31ad6b78 100644
--- a/application/core/FHC_Model.php
+++ b/application/core/FHC_Model.php
@@ -3,17 +3,16 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 class FHC_Model extends CI_Model
 {
-	//protected errormsg;
 	function __construct($uid = null)
 	{
 		parent::__construct();
 		$this->load->helper('language');
 		$this->lang->load('fhc_model');
-		//$this->load->helper('fhc_db_acl');
 		$this->lang->load('fhcomplete');
-		//$this->load->library('session');
-		if (is_null($uid))
+		if (is_null($uid) && isset($this->session->uid))
 			$uid = $this->session->uid;
+		else
+			$uid = null;
 		$this->load->library('FHC_DB_ACL',array('uid' => $uid));
 	}
 
diff --git a/application/models/accounting/Aufteilung_model.php b/application/models/accounting/Aufteilung_model.php
new file mode 100644
index 000000000..bacd50404
--- /dev/null
+++ b/application/models/accounting/Aufteilung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufteilung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_aufteilung';
+		$this->pk = 'aufteilung_id';
+	}
+}
diff --git a/application/models/accounting/Bestelldetail_model.php b/application/models/accounting/Bestelldetail_model.php
new file mode 100644
index 000000000..dd57002d1
--- /dev/null
+++ b/application/models/accounting/Bestelldetail_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bestelldetail_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_bestelldetail';
+		$this->pk = 'bestelldetail_id';
+	}
+}
diff --git a/application/models/accounting/Bestelldetailtag_model.php b/application/models/accounting/Bestelldetailtag_model.php
new file mode 100644
index 000000000..a760c26a2
--- /dev/null
+++ b/application/models/accounting/Bestelldetailtag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bestelldetailtag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_bestelldetailtag';
+		$this->pk = array('bestelldetail_id', 'tag');
+	}
+}
diff --git a/application/models/accounting/Bestellstatus_model.php b/application/models/accounting/Bestellstatus_model.php
new file mode 100644
index 000000000..0f9810818
--- /dev/null
+++ b/application/models/accounting/Bestellstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bestellstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_bestellstatus';
+		$this->pk = 'bestellstatus_kurzbz';
+	}
+}
diff --git a/application/models/accounting/Bestellung_model.php b/application/models/accounting/Bestellung_model.php
new file mode 100644
index 000000000..0d0ea37f8
--- /dev/null
+++ b/application/models/accounting/Bestellung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bestellung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_bestellung';
+		$this->pk = 'bestellung_id';
+	}
+}
diff --git a/application/models/accounting/Bestellungtag_model.php b/application/models/accounting/Bestellungtag_model.php
new file mode 100644
index 000000000..77c7416f5
--- /dev/null
+++ b/application/models/accounting/Bestellungtag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bestellungtag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_bestellungtag';
+		$this->pk = array('bestellung_id', 'tag');
+	}
+}
diff --git a/application/models/accounting/Buchung_model.php b/application/models/accounting/Buchung_model.php
new file mode 100644
index 000000000..adc700dfc
--- /dev/null
+++ b/application/models/accounting/Buchung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Buchung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_buchung';
+		$this->pk = 'buchung_id';
+	}
+}
diff --git a/application/models/accounting/Buchungstyp_model.php b/application/models/accounting/Buchungstyp_model.php
new file mode 100644
index 000000000..7ed47217d
--- /dev/null
+++ b/application/models/accounting/Buchungstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Buchungstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_buchungstyp';
+		$this->pk = 'buchungstyp_kurzbz';
+	}
+}
diff --git a/application/models/accounting/Budget_model.php b/application/models/accounting/Budget_model.php
new file mode 100644
index 000000000..f425f3479
--- /dev/null
+++ b/application/models/accounting/Budget_model.php
@@ -0,0 +1,14 @@
+<?php
+class Budget_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_budget';
+		$this->pk = array('kostenstelle_id', 'geschaeftsjahr_kurzbz');
+	}
+}
diff --git a/application/models/accounting/Konto_model.php b/application/models/accounting/Konto_model.php
new file mode 100644
index 000000000..d041909cd
--- /dev/null
+++ b/application/models/accounting/Konto_model.php
@@ -0,0 +1,14 @@
+<?php
+class Konto_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_konto';
+		$this->pk = 'konto_id';
+	}
+}
diff --git a/application/models/accounting/Kostenstelle_model.php b/application/models/accounting/Kostenstelle_model.php
new file mode 100644
index 000000000..489286306
--- /dev/null
+++ b/application/models/accounting/Kostenstelle_model.php
@@ -0,0 +1,14 @@
+<?php
+class Kostenstelle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_kostenstelle';
+		$this->pk = 'kostenstelle_id';
+	}
+}
diff --git a/application/models/accounting/Rechnung_model.php b/application/models/accounting/Rechnung_model.php
new file mode 100644
index 000000000..6e5ddcf83
--- /dev/null
+++ b/application/models/accounting/Rechnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Rechnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_rechnung';
+		$this->pk = 'rechnung_id';
+	}
+}
diff --git a/application/models/accounting/Rechnungsbetrag_model.php b/application/models/accounting/Rechnungsbetrag_model.php
new file mode 100644
index 000000000..11617429c
--- /dev/null
+++ b/application/models/accounting/Rechnungsbetrag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Rechnungsbetrag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_rechnungsbetrag';
+		$this->pk = 'rechnungsbetrag_id';
+	}
+}
diff --git a/application/models/accounting/Rechnungstyp_model.php b/application/models/accounting/Rechnungstyp_model.php
new file mode 100644
index 000000000..3f1e0633e
--- /dev/null
+++ b/application/models/accounting/Rechnungstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Rechnungstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_rechnungstyp';
+		$this->pk = 'rechnungstyp_kurzbz';
+	}
+}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
new file mode 100644
index 000000000..cd4b466d6
--- /dev/null
+++ b/application/models/accounting/Vertrag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vertrag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_vertrag';
+		$this->pk = 'vertrag_id';
+	}
+}
diff --git a/application/models/accounting/Vertragsstatus_model.php b/application/models/accounting/Vertragsstatus_model.php
new file mode 100644
index 000000000..21367b84a
--- /dev/null
+++ b/application/models/accounting/Vertragsstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vertragsstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_vertragsstatus';
+		$this->pk = 'vertragsstatus_kurzbz';
+	}
+}
diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php
new file mode 100644
index 000000000..42d248217
--- /dev/null
+++ b/application/models/accounting/Vertragstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vertragstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_vertragstyp';
+		$this->pk = 'vertragstyp_kurzbz';
+	}
+}
diff --git a/application/models/accounting/Zahlungstyp_model.php b/application/models/accounting/Zahlungstyp_model.php
new file mode 100644
index 000000000..5ab7350ab
--- /dev/null
+++ b/application/models/accounting/Zahlungstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zahlungstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_zahlungstyp';
+		$this->pk = 'zahlungstyp_kurzbz';
+	}
+}
diff --git a/application/models/codex/Akadgrad_model.php b/application/models/codex/Akadgrad_model.php
new file mode 100644
index 000000000..0623ef3ab
--- /dev/null
+++ b/application/models/codex/Akadgrad_model.php
@@ -0,0 +1,14 @@
+<?php
+class Akadgrad_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_akadgrad';
+		$this->pk = 'akadgrad_id';
+	}
+}
diff --git a/application/models/codex/Archiv_model.php b/application/models/codex/Archiv_model.php
new file mode 100644
index 000000000..45cde5a00
--- /dev/null
+++ b/application/models/codex/Archiv_model.php
@@ -0,0 +1,14 @@
+<?php
+class Archiv_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_archiv';
+		$this->pk = 'archiv_id';
+	}
+}
diff --git a/application/models/codex/Aufmerksamdurch_model.php b/application/models/codex/Aufmerksamdurch_model.php
new file mode 100644
index 000000000..2c5f5d2c6
--- /dev/null
+++ b/application/models/codex/Aufmerksamdurch_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufmerksamdurch_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_aufmerksamdurch';
+		$this->pk = 'aufmerksamdurch_kurzbz';
+	}
+}
diff --git a/application/models/codex/Ausbildung_model.php b/application/models/codex/Ausbildung_model.php
new file mode 100644
index 000000000..8cadcb92d
--- /dev/null
+++ b/application/models/codex/Ausbildung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ausbildung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_ausbildung';
+		$this->pk = 'ausbildungcode';
+	}
+}
diff --git a/application/models/codex/Berufstaetigkeit_model.php b/application/models/codex/Berufstaetigkeit_model.php
new file mode 100644
index 000000000..59b39d775
--- /dev/null
+++ b/application/models/codex/Berufstaetigkeit_model.php
@@ -0,0 +1,14 @@
+<?php
+class Berufstaetigkeit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_berufstaetigkeit';
+		$this->pk = 'berufstaetigkeit_code';
+	}
+}
diff --git a/application/models/codex/Beschaeftigungsausmass_model.php b/application/models/codex/Beschaeftigungsausmass_model.php
new file mode 100644
index 000000000..3b54fa310
--- /dev/null
+++ b/application/models/codex/Beschaeftigungsausmass_model.php
@@ -0,0 +1,14 @@
+<?php
+class Beschaeftigungsausmass_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_beschaeftigungsausmass';
+		$this->pk = 'beschausmasscode';
+	}
+}
diff --git a/application/models/codex/Besqual_model.php b/application/models/codex/Besqual_model.php
new file mode 100644
index 000000000..b89cb123a
--- /dev/null
+++ b/application/models/codex/Besqual_model.php
@@ -0,0 +1,14 @@
+<?php
+class Besqual_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_besqual';
+		$this->pk = 'besqualcode';
+	}
+}
diff --git a/application/models/codex/Bisfunktion_model.php b/application/models/codex/Bisfunktion_model.php
new file mode 100644
index 000000000..72135ecc0
--- /dev/null
+++ b/application/models/codex/Bisfunktion_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bisfunktion_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisfunktion';
+		$this->pk = array('studiengang_kz', 'bisverwendung_id');
+	}
+}
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
new file mode 100644
index 000000000..5f35aec9a
--- /dev/null
+++ b/application/models/codex/Bisio_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bisio_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisio';
+		$this->pk = 'bisio_id';
+	}
+}
diff --git a/application/models/codex/Bisorgform_model.php b/application/models/codex/Bisorgform_model.php
new file mode 100644
index 000000000..c489c849c
--- /dev/null
+++ b/application/models/codex/Bisorgform_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bisorgform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisorgform';
+		$this->pk = 'bisorgform_kurzbz';
+	}
+}
diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php
new file mode 100644
index 000000000..fa2cf84d0
--- /dev/null
+++ b/application/models/codex/Bisverwendung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bisverwendung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisverwendung';
+		$this->pk = 'bisverwendung_id';
+	}
+}
diff --git a/application/models/codex/Bundesland_model.php b/application/models/codex/Bundesland_model.php
new file mode 100644
index 000000000..03a4774ce
--- /dev/null
+++ b/application/models/codex/Bundesland_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bundesland_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bundesland';
+		$this->pk = 'bundesland_code';
+	}
+}
diff --git a/application/models/codex/Entwicklungsteam_model.php b/application/models/codex/Entwicklungsteam_model.php
new file mode 100644
index 000000000..5cf21c23b
--- /dev/null
+++ b/application/models/codex/Entwicklungsteam_model.php
@@ -0,0 +1,14 @@
+<?php
+class Entwicklungsteam_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_entwicklungsteam';
+		$this->pk = array('studiengang_kz', 'mitarbeiter_uid');
+	}
+}
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
new file mode 100644
index 000000000..e25d75416
--- /dev/null
+++ b/application/models/codex/Gemeinde_model.php
@@ -0,0 +1,14 @@
+<?php
+class Gemeinde_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_gemeinde';
+		$this->pk = 'gemeinde_id';
+	}
+}
diff --git a/application/models/codex/Hauptberuf_model.php b/application/models/codex/Hauptberuf_model.php
new file mode 100644
index 000000000..7ae7ee44d
--- /dev/null
+++ b/application/models/codex/Hauptberuf_model.php
@@ -0,0 +1,14 @@
+<?php
+class Hauptberuf_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_hauptberuf';
+		$this->pk = 'hauptberufcode';
+	}
+}
diff --git a/application/models/codex/Lehrform_model.php b/application/models/codex/Lehrform_model.php
new file mode 100644
index 000000000..dc53b3085
--- /dev/null
+++ b/application/models/codex/Lehrform_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrform';
+		$this->pk = 'lehrform_kurzbz';
+	}
+}
diff --git a/application/models/codex/Lgartcode_model.php b/application/models/codex/Lgartcode_model.php
new file mode 100644
index 000000000..a2c09c00e
--- /dev/null
+++ b/application/models/codex/Lgartcode_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lgartcode_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_lgartcode';
+		$this->pk = 'lgartcode';
+	}
+}
diff --git a/application/models/codex/Mobilitaetsprogramm_model.php b/application/models/codex/Mobilitaetsprogramm_model.php
new file mode 100644
index 000000000..5fd46e725
--- /dev/null
+++ b/application/models/codex/Mobilitaetsprogramm_model.php
@@ -0,0 +1,14 @@
+<?php
+class Mobilitaetsprogramm_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_mobilitaetsprogramm';
+		$this->pk = 'mobilitaetsprogramm_code';
+	}
+}
diff --git a/application/models/Nation_model.php b/application/models/codex/Nation_model.php
similarity index 93%
rename from application/models/Nation_model.php
rename to application/models/codex/Nation_model.php
index cac2b2f8a..73e6a71b4 100644
--- a/application/models/Nation_model.php
+++ b/application/models/codex/Nation_model.php
@@ -1,17 +1,19 @@
 <?php
-
 class Nation_model extends DB_Model
 {
+
 	protected $_bundeslandQuery = "SELECT * FROM bis.tbl_bundesland";
 	
 	/**
-	 * 
+	 * Constructor
 	 */
 	public function __construct()
 	{
 		parent::__construct();
+		$this->dbTable = 'bis.tbl_nation';
+		$this->pk = 'nation_code';
 	}
-	
+
 	/**
 	 * 
 	 */
@@ -68,4 +70,4 @@ class Nation_model extends DB_Model
 		
 		return $result;
 	}
-}
\ No newline at end of file
+}
diff --git a/application/models/codex/Note_model.php b/application/models/codex/Note_model.php
new file mode 100644
index 000000000..e83ee2f48
--- /dev/null
+++ b/application/models/codex/Note_model.php
@@ -0,0 +1,14 @@
+<?php
+class Note_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_note';
+		$this->pk = 'note';
+	}
+}
diff --git a/application/models/codex/Orgform_model.php b/application/models/codex/Orgform_model.php
new file mode 100644
index 000000000..509a617cc
--- /dev/null
+++ b/application/models/codex/Orgform_model.php
@@ -0,0 +1,14 @@
+<?php
+class Orgform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_orgform';
+		$this->pk = 'orgform_kurzbz';
+	}
+}
diff --git a/application/models/codex/Verwendung_model.php b/application/models/codex/Verwendung_model.php
new file mode 100644
index 000000000..509b0388b
--- /dev/null
+++ b/application/models/codex/Verwendung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Verwendung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_verwendung';
+		$this->pk = 'verwendung_code';
+	}
+}
diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php
new file mode 100644
index 000000000..1e1ba99ad
--- /dev/null
+++ b/application/models/codex/Zgv_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zgv_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgv';
+		$this->pk = 'zgv_code';
+	}
+}
diff --git a/application/models/codex/Zgvdoktor_model.php b/application/models/codex/Zgvdoktor_model.php
new file mode 100644
index 000000000..8caf397e0
--- /dev/null
+++ b/application/models/codex/Zgvdoktor_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zgvdoktor_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvdoktor';
+		$this->pk = 'zgvdoktor_code';
+	}
+}
diff --git a/application/models/codex/Zgvgruppe_model.php b/application/models/codex/Zgvgruppe_model.php
new file mode 100644
index 000000000..32b022c51
--- /dev/null
+++ b/application/models/codex/Zgvgruppe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zgvgruppe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvgruppe';
+		$this->pk = ;
+	}
+}
diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php
new file mode 100644
index 000000000..38f8a0dcb
--- /dev/null
+++ b/application/models/codex/Zgvmaster_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zgvmaster_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvmaster';
+		$this->pk = 'zgvmas_code';
+	}
+}
diff --git a/application/models/codex/Zweck_model.php b/application/models/codex/Zweck_model.php
new file mode 100644
index 000000000..600e9fb40
--- /dev/null
+++ b/application/models/codex/Zweck_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zweck_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zweck';
+		$this->pk = 'zweck_code';
+	}
+}
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
new file mode 100644
index 000000000..84109e17b
--- /dev/null
+++ b/application/models/content/Ampel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ampel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_ampel';
+		$this->pk = 'ampel_id';
+	}
+}
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
new file mode 100644
index 000000000..ee4315ebd
--- /dev/null
+++ b/application/models/content/Content_model.php
@@ -0,0 +1,14 @@
+<?php
+class Content_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_content';
+		$this->pk = 'content_id';
+	}
+}
diff --git a/application/models/content/Contentchild_model.php b/application/models/content/Contentchild_model.php
new file mode 100644
index 000000000..11738d144
--- /dev/null
+++ b/application/models/content/Contentchild_model.php
@@ -0,0 +1,14 @@
+<?php
+class Contentchild_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_contentchild';
+		$this->pk = 'contentchild_id';
+	}
+}
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
new file mode 100644
index 000000000..03efc87b1
--- /dev/null
+++ b/application/models/content/Contentgruppe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Contentgruppe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_contentgruppe';
+		$this->pk = array('gruppe_kurzbz', 'content_id');
+	}
+}
diff --git a/application/models/content/Contentlog_model.php b/application/models/content/Contentlog_model.php
new file mode 100644
index 000000000..025cb94aa
--- /dev/null
+++ b/application/models/content/Contentlog_model.php
@@ -0,0 +1,14 @@
+<?php
+class Contentlog_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_contentlog';
+		$this->pk = 'contentlog_id';
+	}
+}
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
new file mode 100644
index 000000000..eb7e257b2
--- /dev/null
+++ b/application/models/content/Contentsprache_model.php
@@ -0,0 +1,14 @@
+<?php
+class Contentsprache_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_contentsprache';
+		$this->pk = 'contentsprache_id';
+	}
+}
diff --git a/application/models/content/Dms_model.php b/application/models/content/Dms_model.php
new file mode 100644
index 000000000..d5d9106d3
--- /dev/null
+++ b/application/models/content/Dms_model.php
@@ -0,0 +1,14 @@
+<?php
+class Dms_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_dms';
+		$this->pk = 'dms_id';
+	}
+}
diff --git a/application/models/content/Infoscreen_model.php b/application/models/content/Infoscreen_model.php
new file mode 100644
index 000000000..c4134ff06
--- /dev/null
+++ b/application/models/content/Infoscreen_model.php
@@ -0,0 +1,14 @@
+<?php
+class Infoscreen_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_infoscreen';
+		$this->pk = 'infoscreen_id';
+	}
+}
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
new file mode 100644
index 000000000..8d636d808
--- /dev/null
+++ b/application/models/content/News_model.php
@@ -0,0 +1,14 @@
+<?php
+class News_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_news';
+		$this->pk = 'news_id';
+	}
+}
diff --git a/application/models/content/Template_model.php b/application/models/content/Template_model.php
new file mode 100644
index 000000000..6f452e23c
--- /dev/null
+++ b/application/models/content/Template_model.php
@@ -0,0 +1,14 @@
+<?php
+class Template_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_template';
+		$this->pk = 'template_kurzbz';
+	}
+}
diff --git a/application/models/content/Veranstaltung_model.php b/application/models/content/Veranstaltung_model.php
new file mode 100644
index 000000000..48e7bc2cc
--- /dev/null
+++ b/application/models/content/Veranstaltung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Veranstaltung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_veranstaltung';
+		$this->pk = 'veranstaltung_id';
+	}
+}
diff --git a/application/models/content/Veranstaltungskategorie_model.php b/application/models/content/Veranstaltungskategorie_model.php
new file mode 100644
index 000000000..85d069735
--- /dev/null
+++ b/application/models/content/Veranstaltungskategorie_model.php
@@ -0,0 +1,14 @@
+<?php
+class Veranstaltungskategorie_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_veranstaltungskategorie';
+		$this->pk = 'veranstaltungskategorie_kurzbz';
+	}
+}
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
new file mode 100644
index 000000000..c844de435
--- /dev/null
+++ b/application/models/crm/Akte_model.php
@@ -0,0 +1,14 @@
+<?php
+class Akte_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_akte';
+		$this->pk = 'akte_id';
+	}
+}
diff --git a/application/models/crm/Aufnahmeschluessel_model.php b/application/models/crm/Aufnahmeschluessel_model.php
new file mode 100644
index 000000000..df74791bb
--- /dev/null
+++ b/application/models/crm/Aufnahmeschluessel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufnahmeschluessel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_aufnahmeschluessel';
+		$this->pk = 'aufnahmeschluessel';
+	}
+}
diff --git a/application/models/crm/Aufnahmetermin_model.php b/application/models/crm/Aufnahmetermin_model.php
new file mode 100644
index 000000000..c023f6403
--- /dev/null
+++ b/application/models/crm/Aufnahmetermin_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufnahmetermin_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_aufnahmetermin';
+		$this->pk = 'aufnahmetermin_id';
+	}
+}
diff --git a/application/models/crm/Aufnahmetermintyp_model.php b/application/models/crm/Aufnahmetermintyp_model.php
new file mode 100644
index 000000000..e75db011c
--- /dev/null
+++ b/application/models/crm/Aufnahmetermintyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufnahmetermintyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_aufnahmetermintyp';
+		$this->pk = 'aufnahmetermintyp_kurzbz';
+	}
+}
diff --git a/application/models/crm/Bewerbungstermine_model.php b/application/models/crm/Bewerbungstermine_model.php
new file mode 100644
index 000000000..74326a702
--- /dev/null
+++ b/application/models/crm/Bewerbungstermine_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bewerbungstermine_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_bewerbungstermine';
+		$this->pk = 'bewerbungstermin_id';
+	}
+}
diff --git a/application/models/crm/Buchungstyp_model.php b/application/models/crm/Buchungstyp_model.php
new file mode 100644
index 000000000..f06e45eb2
--- /dev/null
+++ b/application/models/crm/Buchungstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Buchungstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_buchungstyp';
+		$this->pk = 'buchungstyp_kurzbz';
+	}
+}
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
new file mode 100644
index 000000000..7ef2be716
--- /dev/null
+++ b/application/models/crm/Dokument_model.php
@@ -0,0 +1,14 @@
+<?php
+class Dokument_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_dokument';
+		$this->pk = 'dokument_kurzbz';
+	}
+}
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
new file mode 100644
index 000000000..e5cebe31f
--- /dev/null
+++ b/application/models/crm/Dokumentprestudent_model.php
@@ -0,0 +1,14 @@
+<?php
+class Dokumentprestudent_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_dokumentprestudent';
+		$this->pk = array('prestudent_id', 'dokument_kurzbz');
+	}
+}
diff --git a/application/models/crm/Dokumentstudiengang_model.php b/application/models/crm/Dokumentstudiengang_model.php
new file mode 100644
index 000000000..4be973650
--- /dev/null
+++ b/application/models/crm/Dokumentstudiengang_model.php
@@ -0,0 +1,14 @@
+<?php
+class Dokumentstudiengang_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_dokumentstudiengang';
+		$this->pk = array('studiengang_kz', 'dokument_kurzbz');
+	}
+}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
new file mode 100644
index 000000000..286d3189e
--- /dev/null
+++ b/application/models/crm/Konto_model.php
@@ -0,0 +1,14 @@
+<?php
+class Konto_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_konto';
+		$this->pk = 'buchungsnr';
+	}
+}
diff --git a/application/models/crm/Preincoming_model.php b/application/models/crm/Preincoming_model.php
new file mode 100644
index 000000000..f9906781f
--- /dev/null
+++ b/application/models/crm/Preincoming_model.php
@@ -0,0 +1,14 @@
+<?php
+class Preincoming_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_preincoming';
+		$this->pk = 'preincoming_id';
+	}
+}
diff --git a/application/models/crm/Preinteressent_model.php b/application/models/crm/Preinteressent_model.php
new file mode 100644
index 000000000..bfc2a8afa
--- /dev/null
+++ b/application/models/crm/Preinteressent_model.php
@@ -0,0 +1,14 @@
+<?php
+class Preinteressent_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_preinteressent';
+		$this->pk = 'preinteressent_id';
+	}
+}
diff --git a/application/models/crm/Preinteressentstudiengang_model.php b/application/models/crm/Preinteressentstudiengang_model.php
new file mode 100644
index 000000000..4ed665840
--- /dev/null
+++ b/application/models/crm/Preinteressentstudiengang_model.php
@@ -0,0 +1,14 @@
+<?php
+class Preinteressentstudiengang_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_preinteressentstudiengang';
+		$this->pk = array('preinteressent_id', 'studiengang_kz');
+	}
+}
diff --git a/application/models/crm/Preoutgoing_model.php b/application/models/crm/Preoutgoing_model.php
new file mode 100644
index 000000000..e9e8e76fd
--- /dev/null
+++ b/application/models/crm/Preoutgoing_model.php
@@ -0,0 +1,14 @@
+<?php
+class Preoutgoing_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_preoutgoing';
+		$this->pk = 'preoutgoing_id';
+	}
+}
diff --git a/application/models/person/Prestudent_model.php b/application/models/crm/Prestudent_model.php
similarity index 91%
rename from application/models/person/Prestudent_model.php
rename to application/models/crm/Prestudent_model.php
index a459d036d..0908b4c8a 100644
--- a/application/models/person/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -2,16 +2,14 @@
 
 class Prestudent_model extends DB_Model
 {
-
-	
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable='public.tbl_prestudent';
-		$this->pk='prestudent_id';
+		$this->dbTable = 'public.tbl_prestudent';
+		$this->pk = 'prestudent_id';
 	}
 
 	/**
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
new file mode 100644
index 000000000..dbc6f3abe
--- /dev/null
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Prestudentstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_prestudentstatus';
+		$this->pk = array('ausbildungssemester', 'studiensemester_kurzbz', 'status_kurzbz', 'prestudent_id');
+	}
+}
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
new file mode 100644
index 000000000..f4f0478de
--- /dev/null
+++ b/application/models/crm/Reihungstest_model.php
@@ -0,0 +1,14 @@
+<?php
+class Reihungstest_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_reihungstest';
+		$this->pk = 'reihungstest_id';
+	}
+}
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
new file mode 100644
index 000000000..7b1b38ecb
--- /dev/null
+++ b/application/models/crm/Status_model.php
@@ -0,0 +1,14 @@
+<?php
+class Status_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_status';
+		$this->pk = 'status_kurzbz';
+	}
+}
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
new file mode 100644
index 000000000..75390b466
--- /dev/null
+++ b/application/models/crm/Student_model.php
@@ -0,0 +1,14 @@
+<?php
+class Student_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_student';
+		$this->pk = 'student_uid';
+	}
+}
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
new file mode 100644
index 000000000..c68bc55f4
--- /dev/null
+++ b/application/models/education/Abgabe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Abgabe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_abgabe';
+		$this->pk = 'abgabe_id';
+	}
+}
diff --git a/application/models/education/Abschlussbeurteilung_model.php b/application/models/education/Abschlussbeurteilung_model.php
new file mode 100644
index 000000000..26d6d8206
--- /dev/null
+++ b/application/models/education/Abschlussbeurteilung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Abschlussbeurteilung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_abschlussbeurteilung';
+		$this->pk = 'abschlussbeurteilung_kurzbz';
+	}
+}
diff --git a/application/models/education/Abschlusspruefung_model.php b/application/models/education/Abschlusspruefung_model.php
new file mode 100644
index 000000000..aef5f67c3
--- /dev/null
+++ b/application/models/education/Abschlusspruefung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Abschlusspruefung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_abschlusspruefung';
+		$this->pk = 'abschlusspruefung_id';
+	}
+}
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
new file mode 100644
index 000000000..f16310fe4
--- /dev/null
+++ b/application/models/education/Anrechnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Anrechnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_anrechnung';
+		$this->pk = 'anrechnung_id';
+	}
+}
diff --git a/application/models/education/Anwesenheit_model.php b/application/models/education/Anwesenheit_model.php
new file mode 100644
index 000000000..80a1fc111
--- /dev/null
+++ b/application/models/education/Anwesenheit_model.php
@@ -0,0 +1,14 @@
+<?php
+class Anwesenheit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_anwesenheit';
+		$this->pk = 'anwesenheit_id';
+	}
+}
diff --git a/application/models/education/Beispiel_model.php b/application/models/education/Beispiel_model.php
new file mode 100644
index 000000000..42ac2227a
--- /dev/null
+++ b/application/models/education/Beispiel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Beispiel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_beispiel';
+		$this->pk = 'beispiel_id';
+	}
+}
diff --git a/application/models/education/Betreuerart_model.php b/application/models/education/Betreuerart_model.php
new file mode 100644
index 000000000..82909c736
--- /dev/null
+++ b/application/models/education/Betreuerart_model.php
@@ -0,0 +1,14 @@
+<?php
+class Betreuerart_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_betreuerart';
+		$this->pk = 'betreuerart_kurzbz';
+	}
+}
diff --git a/application/models/education/Feedback_model.php b/application/models/education/Feedback_model.php
new file mode 100644
index 000000000..8463fbe53
--- /dev/null
+++ b/application/models/education/Feedback_model.php
@@ -0,0 +1,14 @@
+<?php
+class Feedback_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_feedback';
+		$this->pk = 'feedback_id';
+	}
+}
diff --git a/application/models/education/Legesamtnote_model.php b/application/models/education/Legesamtnote_model.php
new file mode 100644
index 000000000..6e204d4b6
--- /dev/null
+++ b/application/models/education/Legesamtnote_model.php
@@ -0,0 +1,14 @@
+<?php
+class Legesamtnote_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_legesamtnote';
+		$this->pk = array('lehreinheit_id', 'student_uid');
+	}
+}
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
new file mode 100644
index 000000000..e07a5c350
--- /dev/null
+++ b/application/models/education/Lehreinheit_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehreinheit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehreinheit';
+		$this->pk = 'lehreinheit_id';
+	}
+}
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
new file mode 100644
index 000000000..cfd59f937
--- /dev/null
+++ b/application/models/education/Lehreinheitgruppe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehreinheitgruppe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehreinheitgruppe';
+		$this->pk = 'lehreinheitgruppe_id';
+	}
+}
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
new file mode 100644
index 000000000..ee11dcd01
--- /dev/null
+++ b/application/models/education/Lehreinheitmitarbeiter_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehreinheitmitarbeiter_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehreinheitmitarbeiter';
+		$this->pk = array('mitarbeiter_uid', 'lehreinheit_id');
+	}
+}
diff --git a/application/models/education/Lehrfach_model.php b/application/models/education/Lehrfach_model.php
new file mode 100644
index 000000000..41662131f
--- /dev/null
+++ b/application/models/education/Lehrfach_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrfach_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrfach';
+		$this->pk = 'lehrfach_id';
+	}
+}
diff --git a/application/models/education/Lehrfunktion_model.php b/application/models/education/Lehrfunktion_model.php
new file mode 100644
index 000000000..82ab6eaac
--- /dev/null
+++ b/application/models/education/Lehrfunktion_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrfunktion_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrfunktion';
+		$this->pk = 'lehrfunktion_kurzbz';
+	}
+}
diff --git a/application/models/education/Lehrtyp_model.php b/application/models/education/Lehrtyp_model.php
new file mode 100644
index 000000000..76ef35450
--- /dev/null
+++ b/application/models/education/Lehrtyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrtyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrtyp';
+		$this->pk = 'lehrtyp_kurzbz';
+	}
+}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
new file mode 100644
index 000000000..6b3f848aa
--- /dev/null
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrveranstaltung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrveranstaltung';
+		$this->pk = 'lehrveranstaltung_id';
+	}
+}
diff --git a/application/models/education/Lvangebot_model.php b/application/models/education/Lvangebot_model.php
new file mode 100644
index 000000000..e16b726dd
--- /dev/null
+++ b/application/models/education/Lvangebot_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lvangebot_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lvangebot';
+		$this->pk = 'lvangebot_id';
+	}
+}
diff --git a/application/models/education/Lvgesamtnote_model.php b/application/models/education/Lvgesamtnote_model.php
new file mode 100644
index 000000000..f0c1883de
--- /dev/null
+++ b/application/models/education/Lvgesamtnote_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lvgesamtnote_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_lvgesamtnote';
+		$this->pk = array('student_uid', 'studiensemester_kurzbz', 'lehrveranstaltung_id');
+	}
+}
diff --git a/application/models/education/Lvinfo_model.php b/application/models/education/Lvinfo_model.php
new file mode 100644
index 000000000..7ed05d59e
--- /dev/null
+++ b/application/models/education/Lvinfo_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lvinfo_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_lvinfo';
+		$this->pk = array('sprache', 'lehrveranstaltung_id');
+	}
+}
diff --git a/application/models/education/Lvregel_model.php b/application/models/education/Lvregel_model.php
new file mode 100644
index 000000000..81d0b15f7
--- /dev/null
+++ b/application/models/education/Lvregel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lvregel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lvregel';
+		$this->pk = 'lvregel_id';
+	}
+}
diff --git a/application/models/education/Lvregeltyp_model.php b/application/models/education/Lvregeltyp_model.php
new file mode 100644
index 000000000..ef7e74336
--- /dev/null
+++ b/application/models/education/Lvregeltyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lvregeltyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lvregeltyp';
+		$this->pk = 'lvregeltyp_kurzbz';
+	}
+}
diff --git a/application/models/education/Moodle_model.php b/application/models/education/Moodle_model.php
new file mode 100644
index 000000000..d28026ef9
--- /dev/null
+++ b/application/models/education/Moodle_model.php
@@ -0,0 +1,14 @@
+<?php
+class Moodle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_moodle';
+		$this->pk = 'moodle_id';
+	}
+}
diff --git a/application/models/education/Notenschluessel_model.php b/application/models/education/Notenschluessel_model.php
new file mode 100644
index 000000000..681b5244c
--- /dev/null
+++ b/application/models/education/Notenschluessel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notenschluessel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_notenschluessel';
+		$this->pk = 'notenschluessel_kurzbz';
+	}
+}
diff --git a/application/models/education/Notenschluesselaufteilung_model.php b/application/models/education/Notenschluesselaufteilung_model.php
new file mode 100644
index 000000000..5e0f2f05c
--- /dev/null
+++ b/application/models/education/Notenschluesselaufteilung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notenschluesselaufteilung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_notenschluesselaufteilung';
+		$this->pk = 'notenschluesselaufteilung_id';
+	}
+}
diff --git a/application/models/education/Notenschluesseluebung_model.php b/application/models/education/Notenschluesseluebung_model.php
new file mode 100644
index 000000000..77d64c2f7
--- /dev/null
+++ b/application/models/education/Notenschluesseluebung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notenschluesseluebung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_notenschluesseluebung';
+		$this->pk = array('note', 'uebung_id');
+	}
+}
diff --git a/application/models/education/Notenschluesselzuordnung_model.php b/application/models/education/Notenschluesselzuordnung_model.php
new file mode 100644
index 000000000..e6881e12b
--- /dev/null
+++ b/application/models/education/Notenschluesselzuordnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notenschluesselzuordnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_notenschluesselzuordnung';
+		$this->pk = 'notenschluesselzuordnung_id';
+	}
+}
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
new file mode 100644
index 000000000..087c27663
--- /dev/null
+++ b/application/models/education/Paabgabe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Paabgabe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_paabgabe';
+		$this->pk = 'paabgabe_id';
+	}
+}
diff --git a/application/models/education/Paabgabetyp_model.php b/application/models/education/Paabgabetyp_model.php
new file mode 100644
index 000000000..b672a3f0e
--- /dev/null
+++ b/application/models/education/Paabgabetyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Paabgabetyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_paabgabetyp';
+		$this->pk = 'paabgabetyp_kurzbz';
+	}
+}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
new file mode 100644
index 000000000..e5652d6ff
--- /dev/null
+++ b/application/models/education/Projektarbeit_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projektarbeit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_projektarbeit';
+		$this->pk = 'projektarbeit_id';
+	}
+}
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
new file mode 100644
index 000000000..32743be82
--- /dev/null
+++ b/application/models/education/Projektbetreuer_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projektbetreuer_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_projektbetreuer';
+		$this->pk = array('betreuerart_kurzbz', 'projektarbeit_id', 'person_id');
+	}
+}
diff --git a/application/models/education/Projekttyp_model.php b/application/models/education/Projekttyp_model.php
new file mode 100644
index 000000000..966f7164f
--- /dev/null
+++ b/application/models/education/Projekttyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projekttyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_projekttyp';
+		$this->pk = 'projekttyp_kurzbz';
+	}
+}
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
new file mode 100644
index 000000000..6965da6eb
--- /dev/null
+++ b/application/models/education/Pruefung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_pruefung';
+		$this->pk = 'pruefung_id';
+	}
+}
diff --git a/application/models/education/Pruefungsanmeldung_model.php b/application/models/education/Pruefungsanmeldung_model.php
new file mode 100644
index 000000000..5f4569af1
--- /dev/null
+++ b/application/models/education/Pruefungsanmeldung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefungsanmeldung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_pruefungsanmeldung';
+		$this->pk = 'pruefungsanmeldung_id';
+	}
+}
diff --git a/application/models/education/Pruefungsfenster_model.php b/application/models/education/Pruefungsfenster_model.php
new file mode 100644
index 000000000..3f40ce0a4
--- /dev/null
+++ b/application/models/education/Pruefungsfenster_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefungsfenster_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_pruefungsfenster';
+		$this->pk = 'pruefungsfenster_id';
+	}
+}
diff --git a/application/models/education/Pruefungsstatus_model.php b/application/models/education/Pruefungsstatus_model.php
new file mode 100644
index 000000000..6972e69b8
--- /dev/null
+++ b/application/models/education/Pruefungsstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefungsstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_pruefungsstatus';
+		$this->pk = 'status_kurzbz';
+	}
+}
diff --git a/application/models/education/Pruefungstermin_model.php b/application/models/education/Pruefungstermin_model.php
new file mode 100644
index 000000000..4e5557dd1
--- /dev/null
+++ b/application/models/education/Pruefungstermin_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefungstermin_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_pruefungstermin';
+		$this->pk = 'pruefungstermin_id';
+	}
+}
diff --git a/application/models/education/Pruefungstyp_model.php b/application/models/education/Pruefungstyp_model.php
new file mode 100644
index 000000000..50be2f642
--- /dev/null
+++ b/application/models/education/Pruefungstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefungstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_pruefungstyp';
+		$this->pk = 'pruefungstyp_kurzbz';
+	}
+}
diff --git a/application/models/education/Studentbeispiel_model.php b/application/models/education/Studentbeispiel_model.php
new file mode 100644
index 000000000..5c9a8b55e
--- /dev/null
+++ b/application/models/education/Studentbeispiel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studentbeispiel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_studentbeispiel';
+		$this->pk = array('beispiel_id', 'student_uid');
+	}
+}
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
new file mode 100644
index 000000000..3f8a0e14a
--- /dev/null
+++ b/application/models/education/Studentlehrverband_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studentlehrverband_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_studentlehrverband';
+		$this->pk = array('studiensemester_kurzbz', 'student_uid');
+	}
+}
diff --git a/application/models/education/Studentuebung_model.php b/application/models/education/Studentuebung_model.php
new file mode 100644
index 000000000..453e6afa5
--- /dev/null
+++ b/application/models/education/Studentuebung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studentuebung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_studentuebung';
+		$this->pk = array('uebung_id', 'student_uid');
+	}
+}
diff --git a/application/models/education/Uebung_model.php b/application/models/education/Uebung_model.php
new file mode 100644
index 000000000..199328225
--- /dev/null
+++ b/application/models/education/Uebung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Uebung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_uebung';
+		$this->pk = 'uebung_id';
+	}
+}
diff --git a/application/models/education/Zeugnis_model.php b/application/models/education/Zeugnis_model.php
new file mode 100644
index 000000000..21d2f60bf
--- /dev/null
+++ b/application/models/education/Zeugnis_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeugnis_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_zeugnis';
+		$this->pk = 'zeugnis_id';
+	}
+}
diff --git a/application/models/education/Zeugnisnote_model.php b/application/models/education/Zeugnisnote_model.php
new file mode 100644
index 000000000..153a170e1
--- /dev/null
+++ b/application/models/education/Zeugnisnote_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeugnisnote_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_zeugnisnote';
+		$this->pk = array('studiensemester_kurzbz', 'student_uid', 'lehrveranstaltung_id');
+	}
+}
diff --git a/application/models/lehre/Studiengang_model.php b/application/models/lehre/Studiengang_model.php
deleted file mode 100644
index 3fcb6aa35..000000000
--- a/application/models/lehre/Studiengang_model.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-class Studiengang_model extends DB_Model
-{
-	/**
-	 * 
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-	
-	/**
-	 * 
-	 */
-	public function getAllForBewerbung()
-	{
-		$result = NULL;
-		$allForBewerbungQuery = "SELECT DISTINCT studiengang_kz,
-										typ,
-										organisationseinheittyp_kurzbz,
-										studiengangbezeichnung,
-										standort,
-										studiengangbezeichnung_englisch,
-										lgartcode,
-										tbl_lgartcode.bezeichnung
-								   FROM lehre.vw_studienplan LEFT JOIN bis.tbl_lgartcode USING (lgartcode)
-								  WHERE onlinebewerbung IS TRUE
-									AND aktiv IS TRUE
-							   ORDER BY typ, studiengangbezeichnung, tbl_lgartcode.bezeichnung ASC";
-		
-		// Checks if the operation is permitted by the API caller
-		// All the code should be put inside this if statement
-		if(isAllowed($this->getAddonID(), 'course'))
-		{
-			$result = $this->db->query($allForBewerbungQuery);
-		}
-		
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/application/models/organisation/Erhalter_model.php b/application/models/organisation/Erhalter_model.php
new file mode 100644
index 000000000..607d9ccd9
--- /dev/null
+++ b/application/models/organisation/Erhalter_model.php
@@ -0,0 +1,14 @@
+<?php
+class Erhalter_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_erhalter';
+		$this->pk = 'erhalter_kz';
+	}
+}
diff --git a/application/models/organisation/Fachbereich_model.php b/application/models/organisation/Fachbereich_model.php
new file mode 100644
index 000000000..e69565364
--- /dev/null
+++ b/application/models/organisation/Fachbereich_model.php
@@ -0,0 +1,14 @@
+<?php
+class Fachbereich_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_fachbereich';
+		$this->pk = 'fachbereich_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Ferien_model.php b/application/models/organisation/Ferien_model.php
new file mode 100644
index 000000000..2ade75aa4
--- /dev/null
+++ b/application/models/organisation/Ferien_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ferien_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_ferien';
+		$this->pk = array('studiengang_kz', 'bezeichnung');
+	}
+}
diff --git a/application/models/organisation/Geschaeftsjahr_model.php b/application/models/organisation/Geschaeftsjahr_model.php
new file mode 100644
index 000000000..e3c0e9fb2
--- /dev/null
+++ b/application/models/organisation/Geschaeftsjahr_model.php
@@ -0,0 +1,14 @@
+<?php
+class Geschaeftsjahr_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_geschaeftsjahr';
+		$this->pk = 'geschaeftsjahr_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Gruppe_model.php b/application/models/organisation/Gruppe_model.php
new file mode 100644
index 000000000..6369282cc
--- /dev/null
+++ b/application/models/organisation/Gruppe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Gruppe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_gruppe';
+		$this->pk = 'gruppe_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
new file mode 100644
index 000000000..953e4b7b2
--- /dev/null
+++ b/application/models/organisation/Lehrverband_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrverband_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_lehrverband';
+		$this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz');
+	}
+}
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 2a90bf328..81e8d903d 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -1,16 +1,14 @@
 <?php
-
 class Organisationseinheit_model extends DB_Model
 {
 
-	
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable='public.tbl_organisationseinheit';
-		$this->pk='oe_kurzbz';
+		$this->dbTable = 'public.tbl_organisationseinheit';
+		$this->pk = 'oe_kurzbz';
 	}
 }
diff --git a/application/models/organisation/Organisationseinheittyp_model.php b/application/models/organisation/Organisationseinheittyp_model.php
new file mode 100644
index 000000000..6355758b6
--- /dev/null
+++ b/application/models/organisation/Organisationseinheittyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Organisationseinheittyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_organisationseinheittyp';
+		$this->pk = 'organisationseinheittyp_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Semesterwochen_model.php b/application/models/organisation/Semesterwochen_model.php
new file mode 100644
index 000000000..32666804d
--- /dev/null
+++ b/application/models/organisation/Semesterwochen_model.php
@@ -0,0 +1,14 @@
+<?php
+class Semesterwochen_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_semesterwochen';
+		$this->pk = array('studiengang_kz', 'semester');
+	}
+}
diff --git a/application/models/organisation/Service_model.php b/application/models/organisation/Service_model.php
new file mode 100644
index 000000000..5f692e707
--- /dev/null
+++ b/application/models/organisation/Service_model.php
@@ -0,0 +1,14 @@
+<?php
+class Service_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_service';
+		$this->pk = 'service_id';
+	}
+}
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
new file mode 100644
index 000000000..382236e2f
--- /dev/null
+++ b/application/models/organisation/Standort_model.php
@@ -0,0 +1,14 @@
+<?php
+class Standort_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_standort';
+		$this->pk = 'standort_id';
+	}
+}
diff --git a/application/models/organisation/Statistik_model.php b/application/models/organisation/Statistik_model.php
new file mode 100644
index 000000000..b72ac0577
--- /dev/null
+++ b/application/models/organisation/Statistik_model.php
@@ -0,0 +1,14 @@
+<?php
+class Statistik_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_statistik';
+		$this->pk = 'statistik_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 43e4068dc..9b86da5c7 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -1,83 +1,44 @@
 <?php
 
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
 class Studiengang_model extends DB_Model
 {
 
-    public $table = 'public.tbl_studiengang';
-    public $id = 'studiengang_kz';
-    public $order = 'DESC';
-
-    function __construct()
-    {
-        parent::__construct();
-    }
-
-    // get all
-    function get_all()
-    {
-        $this->db->order_by($this->id, $this->order);
-        return $this->db->get($this->table)->result();
-    }
-
-    // get data by id
-    function get_by_id($id)
-    {
-        $this->db->where($this->id, $id);
-        return $this->db->get($this->table)->row();
-    }
-    
-    // get total rows
-    function total_rows() {
-        $this->db->from($this->table);
-        return $this->db->count_all_results();
-    }
-
-    // get data with limit
-    function index_limit($limit, $start = 0) {
-        $this->db->order_by($this->id, $this->order);
-        $this->db->limit($limit, $start);
-        return $this->db->get($this->table)->result();
-    }
-    
-    // get search total rows
-    function search_total_rows($keyword = NULL) {
-        $this->db->like('', $keyword);
-	$this->db->from($this->table);
-        return $this->db->count_all_results();
-    }
-
-    // get search data with limit
-    function search_index_limit($limit, $start = 0, $keyword = NULL) {
-        $this->db->order_by($this->id, $this->order);
-        $this->db->like('', $keyword);
-	$this->db->limit($limit, $start);
-        return $this->db->get($this->table)->result();
-    }
-
-    // insert data
-    function insert($data)
-    {
-        $this->db->insert($this->table, $data);
-    }
-
-    // update data
-    function update($id, $data)
-    {
-        $this->db->where($this->id, $id);
-        $this->db->update($this->table, $data);
-    }
-
-    // delete data
-    function delete($id)
-    {
-        $this->db->where($this->id, $id);
-        $this->db->delete($this->table);
-    }
-
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_studiengang';
+		$this->pk = 'studiengang_kz';
+	}
+	
+	/**
+	 * 
+	 */
+	public function getAllForBewerbung()
+	{
+		$result = NULL;
+		$allForBewerbungQuery = "SELECT DISTINCT studiengang_kz,
+										typ,
+										organisationseinheittyp_kurzbz,
+										studiengangbezeichnung,
+										standort,
+										studiengangbezeichnung_englisch,
+										lgartcode,
+										tbl_lgartcode.bezeichnung
+								   FROM lehre.vw_studienplan LEFT JOIN bis.tbl_lgartcode USING (lgartcode)
+								  WHERE onlinebewerbung IS TRUE
+									AND aktiv IS TRUE
+							   ORDER BY typ, studiengangbezeichnung, tbl_lgartcode.bezeichnung ASC";
+		
+		// Checks if the operation is permitted by the API caller
+		// All the code should be put inside this if statement
+		if(isAllowed($this->getAddonID(), 'course'))
+		{
+			$result = $this->db->query($allForBewerbungQuery);
+		}
+		
+		return $result;
+	}
 }
-
-/* End of file Studiengang_model.php */
-/* Location: ./application/models/Studiengang_model.php */
diff --git a/application/models/organisation/Studiengangstyp_model.php b/application/models/organisation/Studiengangstyp_model.php
new file mode 100644
index 000000000..9a6b5df22
--- /dev/null
+++ b/application/models/organisation/Studiengangstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studiengangstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_studiengangstyp';
+		$this->pk = 'typ';
+	}
+}
diff --git a/application/models/organisation/Studienjahr_model.php b/application/models/organisation/Studienjahr_model.php
new file mode 100644
index 000000000..902d61ba2
--- /dev/null
+++ b/application/models/organisation/Studienjahr_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studienjahr_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_studienjahr';
+		$this->pk = 'studienjahr_kurzbz';
+	}
+}
diff --git a/application/models/organisation/Studienordnung_model.php b/application/models/organisation/Studienordnung_model.php
new file mode 100644
index 000000000..fc2e28d4b
--- /dev/null
+++ b/application/models/organisation/Studienordnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studienordnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_studienordnung';
+		$this->pk = 'studienordnung_id';
+	}
+}
diff --git a/application/models/organisation/Studienordnungstatus_model.php b/application/models/organisation/Studienordnungstatus_model.php
new file mode 100644
index 000000000..8b6417ab1
--- /dev/null
+++ b/application/models/organisation/Studienordnungstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studienordnungstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_studienordnungstatus';
+		$this->pk = 'status_kurzbz';
+	}
+}
diff --git a/application/models/lehre/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
similarity index 100%
rename from application/models/lehre/Studienplan_model.php
rename to application/models/organisation/Studienplan_model.php
diff --git a/application/models/organisation/Studienplatz_model.php b/application/models/organisation/Studienplatz_model.php
new file mode 100644
index 000000000..7bfd8b13b
--- /dev/null
+++ b/application/models/organisation/Studienplatz_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studienplatz_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_studienplatz';
+		$this->pk = 'studienplatz_id';
+	}
+}
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
new file mode 100644
index 000000000..ebf0654ac
--- /dev/null
+++ b/application/models/organisation/Studiensemester_model.php
@@ -0,0 +1,14 @@
+<?php
+class Studiensemester_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_studiensemester';
+		$this->pk = 'studiensemester_kurzbz';
+	}
+}
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
new file mode 100644
index 000000000..3b17ce956
--- /dev/null
+++ b/application/models/person/Adresse_model.php
@@ -0,0 +1,14 @@
+<?php
+class Adresse_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_adresse';
+		$this->pk = 'adresse_id';
+	}
+}
diff --git a/application/models/person/Bankverbindung_model.php b/application/models/person/Bankverbindung_model.php
new file mode 100644
index 000000000..193aad257
--- /dev/null
+++ b/application/models/person/Bankverbindung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bankverbindung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_bankverbindung';
+		$this->pk = 'bankverbindung_id';
+	}
+}
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
new file mode 100644
index 000000000..339c7ea11
--- /dev/null
+++ b/application/models/person/Benutzer_model.php
@@ -0,0 +1,14 @@
+<?php
+class Benutzer_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_benutzer';
+		$this->pk = 'uid';
+	}
+}
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
new file mode 100644
index 000000000..e570a8edf
--- /dev/null
+++ b/application/models/person/Benutzerfunktion_model.php
@@ -0,0 +1,14 @@
+<?php
+class Benutzerfunktion_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_benutzerfunktion';
+		$this->pk = 'benutzerfunktion_id';
+	}
+}
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
new file mode 100644
index 000000000..ab50de9b0
--- /dev/null
+++ b/application/models/person/Benutzergruppe_model.php
@@ -0,0 +1,14 @@
+<?php
+class Benutzergruppe_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_benutzergruppe';
+		$this->pk = array('gruppe_kurzbz', 'uid');
+	}
+}
diff --git a/application/models/person/Fotostatus_model.php b/application/models/person/Fotostatus_model.php
new file mode 100644
index 000000000..eb2b43e51
--- /dev/null
+++ b/application/models/person/Fotostatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Fotostatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_fotostatus';
+		$this->pk = 'fotostatus_kurzbz';
+	}
+}
diff --git a/application/models/person/Freebusy_model.php b/application/models/person/Freebusy_model.php
new file mode 100644
index 000000000..01969dfc1
--- /dev/null
+++ b/application/models/person/Freebusy_model.php
@@ -0,0 +1,14 @@
+<?php
+class Freebusy_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_freebusy';
+		$this->pk = 'freebusy_id';
+	}
+}
diff --git a/application/models/person/Freebusytyp_model.php b/application/models/person/Freebusytyp_model.php
new file mode 100644
index 000000000..d5207850c
--- /dev/null
+++ b/application/models/person/Freebusytyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Freebusytyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_freebusytyp';
+		$this->pk = 'freebusytyp_kurzbz';
+	}
+}
diff --git a/application/models/kontakt/Kontakt_model.php b/application/models/person/Kontakt_model.php
similarity index 79%
rename from application/models/kontakt/Kontakt_model.php
rename to application/models/person/Kontakt_model.php
index 54a987370..8bd905641 100644
--- a/application/models/kontakt/Kontakt_model.php
+++ b/application/models/person/Kontakt_model.php
@@ -1,15 +1,18 @@
 <?php
-
 class Kontakt_model extends DB_Model
 {
 
-    public function __construct($uid = null)
-    {
-	parent::__construct($uid);
-	$this->dbTable = 'public.tbl_kontakt';
-    }
-    
-    public function saveKontakt($kontakt)
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kontakt';
+		$this->pk = 'kontakt_id';
+	}
+
+	public function saveKontakt($kontakt)
     {
 	//TODO check berechtigung
 //	if ($this->fhc_db_acl->bb->isBerechtigt('person', 'sui'))
@@ -43,5 +46,4 @@ class Kontakt_model extends DB_Model
 	
 	return $this->db->get()->result_array();
     }
-
 }
diff --git a/application/models/person/Kontaktmedium_model.php b/application/models/person/Kontaktmedium_model.php
new file mode 100644
index 000000000..cc330ddd7
--- /dev/null
+++ b/application/models/person/Kontaktmedium_model.php
@@ -0,0 +1,14 @@
+<?php
+class Kontaktmedium_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kontaktmedium';
+		$this->pk = 'kontaktmedium_kurzbz';
+	}
+}
diff --git a/application/models/person/Kontakttyp_model.php b/application/models/person/Kontakttyp_model.php
new file mode 100644
index 000000000..d32cded13
--- /dev/null
+++ b/application/models/person/Kontakttyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Kontakttyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kontakttyp';
+		$this->pk = 'kontakttyp';
+	}
+}
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
new file mode 100644
index 000000000..8027f038d
--- /dev/null
+++ b/application/models/person/Notiz_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notiz_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_notiz';
+		$this->pk = 'notiz_id';
+	}
+}
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
new file mode 100644
index 000000000..187a8399b
--- /dev/null
+++ b/application/models/person/Notizzuordnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notizzuordnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_notizzuordnung';
+		$this->pk = 'notizzuordnung_id';
+	}
+}
diff --git a/application/models/project/Aktivitaet_model.php b/application/models/project/Aktivitaet_model.php
new file mode 100644
index 000000000..529040aa3
--- /dev/null
+++ b/application/models/project/Aktivitaet_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aktivitaet_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_aktivitaet';
+		$this->pk = 'aktivitaet_kurzbz';
+	}
+}
diff --git a/application/models/project/Aufwandstyp_model.php b/application/models/project/Aufwandstyp_model.php
new file mode 100644
index 000000000..2f20600ce
--- /dev/null
+++ b/application/models/project/Aufwandstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Aufwandstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_aufwandstyp';
+		$this->pk = 'aufwandstyp_kurzbz';
+	}
+}
diff --git a/application/models/project/Projekt_model.php b/application/models/project/Projekt_model.php
new file mode 100644
index 000000000..e93cec3b9
--- /dev/null
+++ b/application/models/project/Projekt_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projekt_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_projekt';
+		$this->pk = 'projekt_kurzbz';
+	}
+}
diff --git a/application/models/project/Projekt_ressource_model.php b/application/models/project/Projekt_ressource_model.php
new file mode 100644
index 000000000..d641556fd
--- /dev/null
+++ b/application/models/project/Projekt_ressource_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projekt_ressource_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_projekt_ressource';
+		$this->pk = 'projekt_ressource_id';
+	}
+}
diff --git a/application/models/project/Projektphase_model.php b/application/models/project/Projektphase_model.php
new file mode 100644
index 000000000..4980ed64b
--- /dev/null
+++ b/application/models/project/Projektphase_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projektphase_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_projektphase';
+		$this->pk = 'projektphase_id';
+	}
+}
diff --git a/application/models/project/Projekttask_model.php b/application/models/project/Projekttask_model.php
new file mode 100644
index 000000000..64ea94089
--- /dev/null
+++ b/application/models/project/Projekttask_model.php
@@ -0,0 +1,14 @@
+<?php
+class Projekttask_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_projekttask';
+		$this->pk = 'projekttask_id';
+	}
+}
diff --git a/application/models/project/Ressource_model.php b/application/models/project/Ressource_model.php
new file mode 100644
index 000000000..35eb4eb97
--- /dev/null
+++ b/application/models/project/Ressource_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ressource_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_ressource';
+		$this->pk = 'ressource_id';
+	}
+}
diff --git a/application/models/project/Scrumsprint_model.php b/application/models/project/Scrumsprint_model.php
new file mode 100644
index 000000000..c2c8a60a1
--- /dev/null
+++ b/application/models/project/Scrumsprint_model.php
@@ -0,0 +1,14 @@
+<?php
+class Scrumsprint_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_scrumsprint';
+		$this->pk = 'scrumsprint_id';
+	}
+}
diff --git a/application/models/project/Scrumteam_model.php b/application/models/project/Scrumteam_model.php
new file mode 100644
index 000000000..0a19c9837
--- /dev/null
+++ b/application/models/project/Scrumteam_model.php
@@ -0,0 +1,14 @@
+<?php
+class Scrumteam_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'fue.tbl_scrumteam';
+		$this->pk = 'scrumteam_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
new file mode 100644
index 000000000..849a9199f
--- /dev/null
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Betriebsmittel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_betriebsmittel';
+		$this->pk = 'betriebsmittel_id';
+	}
+}
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
new file mode 100644
index 000000000..924f670e0
--- /dev/null
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -0,0 +1,14 @@
+<?php
+class Betriebsmittelperson_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_betriebsmittelperson';
+		$this->pk = 'betriebsmittelperson_id';
+	}
+}
diff --git a/application/models/ressource/Betriebsmittelstatus_model.php b/application/models/ressource/Betriebsmittelstatus_model.php
new file mode 100644
index 000000000..7b4f70c59
--- /dev/null
+++ b/application/models/ressource/Betriebsmittelstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+class Betriebsmittelstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_betriebsmittelstatus';
+		$this->pk = 'betriebsmittelstatus_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Betriebsmitteltyp_model.php b/application/models/ressource/Betriebsmitteltyp_model.php
new file mode 100644
index 000000000..23bec97a8
--- /dev/null
+++ b/application/models/ressource/Betriebsmitteltyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Betriebsmitteltyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'wawi.tbl_betriebsmitteltyp';
+		$this->pk = 'betriebsmitteltyp';
+	}
+}
diff --git a/application/models/ressource/Coodle_model.php b/application/models/ressource/Coodle_model.php
new file mode 100644
index 000000000..1382bf7a0
--- /dev/null
+++ b/application/models/ressource/Coodle_model.php
@@ -0,0 +1,14 @@
+<?php
+class Coodle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_coodle';
+		$this->pk = 'coodle_id';
+	}
+}
diff --git a/application/models/ressource/Erreichbarkeit_model.php b/application/models/ressource/Erreichbarkeit_model.php
new file mode 100644
index 000000000..b16b1614f
--- /dev/null
+++ b/application/models/ressource/Erreichbarkeit_model.php
@@ -0,0 +1,14 @@
+<?php
+class Erreichbarkeit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_erreichbarkeit';
+		$this->pk = 'erreichbarkeit_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
new file mode 100644
index 000000000..1b8dfb51d
--- /dev/null
+++ b/application/models/ressource/Firma_model.php
@@ -0,0 +1,14 @@
+<?php
+class Firma_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_firma';
+		$this->pk = 'firma_id';
+	}
+}
diff --git a/application/models/ressource/Firmatag_model.php b/application/models/ressource/Firmatag_model.php
new file mode 100644
index 000000000..582ea0679
--- /dev/null
+++ b/application/models/ressource/Firmatag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Firmatag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_firmatag';
+		$this->pk = array('tag', 'firma_id');
+	}
+}
diff --git a/application/models/ressource/Firmentyp_model.php b/application/models/ressource/Firmentyp_model.php
new file mode 100644
index 000000000..a9aa93705
--- /dev/null
+++ b/application/models/ressource/Firmentyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Firmentyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_firmentyp';
+		$this->pk = 'firmentyp_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
new file mode 100644
index 000000000..43908167c
--- /dev/null
+++ b/application/models/ressource/Funktion_model.php
@@ -0,0 +1,14 @@
+<?php
+class Funktion_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_funktion';
+		$this->pk = 'funktion_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Lehrmittel_model.php b/application/models/ressource/Lehrmittel_model.php
new file mode 100644
index 000000000..b21e91764
--- /dev/null
+++ b/application/models/ressource/Lehrmittel_model.php
@@ -0,0 +1,14 @@
+<?php
+class Lehrmittel_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrmittel';
+		$this->pk = 'lehrmittel_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
new file mode 100644
index 000000000..1e03a0ecd
--- /dev/null
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -0,0 +1,14 @@
+<?php
+class Mitarbeiter_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_mitarbeiter';
+		$this->pk = 'mitarbeiter_uid';
+	}
+}
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
new file mode 100644
index 000000000..3434c6fc0
--- /dev/null
+++ b/application/models/ressource/Ort_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ort_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_ort';
+		$this->pk = 'ort_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Ortraumtyp_model.php b/application/models/ressource/Ortraumtyp_model.php
new file mode 100644
index 000000000..af0d3cb09
--- /dev/null
+++ b/application/models/ressource/Ortraumtyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ortraumtyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_ortraumtyp';
+		$this->pk = array('hierarchie', 'ort_kurzbz');
+	}
+}
diff --git a/application/models/ressource/Personfunktionstandort_model.php b/application/models/ressource/Personfunktionstandort_model.php
new file mode 100644
index 000000000..addbb760a
--- /dev/null
+++ b/application/models/ressource/Personfunktionstandort_model.php
@@ -0,0 +1,14 @@
+<?php
+class Personfunktionstandort_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_personfunktionstandort';
+		$this->pk = 'personfunktionstandort_id';
+	}
+}
diff --git a/application/models/ressource/Raumtyp_model.php b/application/models/ressource/Raumtyp_model.php
new file mode 100644
index 000000000..afc8a7cc3
--- /dev/null
+++ b/application/models/ressource/Raumtyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Raumtyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_raumtyp';
+		$this->pk = 'raumtyp_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
new file mode 100644
index 000000000..37d0cb376
--- /dev/null
+++ b/application/models/ressource/Reservierung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Reservierung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_reservierung';
+		$this->pk = 'reservierung_id';
+	}
+}
diff --git a/application/models/ressource/Resturlaub_model.php b/application/models/ressource/Resturlaub_model.php
new file mode 100644
index 000000000..a2f6fdf54
--- /dev/null
+++ b/application/models/ressource/Resturlaub_model.php
@@ -0,0 +1,14 @@
+<?php
+class Resturlaub_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_resturlaub';
+		$this->pk = 'mitarbeiter_uid';
+	}
+}
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
new file mode 100644
index 000000000..05a9cddff
--- /dev/null
+++ b/application/models/ressource/Stunde_model.php
@@ -0,0 +1,14 @@
+<?php
+class Stunde_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_stunde';
+		$this->pk = 'stunde';
+	}
+}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
new file mode 100644
index 000000000..be3d520b5
--- /dev/null
+++ b/application/models/ressource/Stundenplan_model.php
@@ -0,0 +1,14 @@
+<?php
+class Stundenplan_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_stundenplan';
+		$this->pk = 'stundenplan_id';
+	}
+}
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
new file mode 100644
index 000000000..9d737e3ec
--- /dev/null
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -0,0 +1,14 @@
+<?php
+class Stundenplandev_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_stundenplandev';
+		$this->pk = 'stundenplandev_id';
+	}
+}
diff --git a/application/models/ressource/Zeitaufzeichnung_model.php b/application/models/ressource/Zeitaufzeichnung_model.php
new file mode 100644
index 000000000..f887a20a0
--- /dev/null
+++ b/application/models/ressource/Zeitaufzeichnung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeitaufzeichnung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_zeitaufzeichnung';
+		$this->pk = 'zeitaufzeichnung_id';
+	}
+}
diff --git a/application/models/ressource/Zeitfenster_model.php b/application/models/ressource/Zeitfenster_model.php
new file mode 100644
index 000000000..e9ef6709c
--- /dev/null
+++ b/application/models/ressource/Zeitfenster_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeitfenster_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_zeitfenster';
+		$this->pk = array('wochentag', 'studiengang_kz', 'ort_kurzbz', 'stunde');
+	}
+}
diff --git a/application/models/ressource/Zeitsperre_model.php b/application/models/ressource/Zeitsperre_model.php
new file mode 100644
index 000000000..07889e349
--- /dev/null
+++ b/application/models/ressource/Zeitsperre_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeitsperre_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_zeitsperre';
+		$this->pk = 'zeitsperre_id';
+	}
+}
diff --git a/application/models/ressource/Zeitsperretyp_model.php b/application/models/ressource/Zeitsperretyp_model.php
new file mode 100644
index 000000000..ef54571e8
--- /dev/null
+++ b/application/models/ressource/Zeitsperretyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeitsperretyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_zeitsperretyp';
+		$this->pk = 'zeitsperretyp_kurzbz';
+	}
+}
diff --git a/application/models/ressource/Zeitwunsch_model.php b/application/models/ressource/Zeitwunsch_model.php
new file mode 100644
index 000000000..ea2ec698a
--- /dev/null
+++ b/application/models/ressource/Zeitwunsch_model.php
@@ -0,0 +1,14 @@
+<?php
+class Zeitwunsch_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_zeitwunsch';
+		$this->pk = array('tag', 'mitarbeiter_uid', 'stunde');
+	}
+}
diff --git a/application/models/system/Appdaten_model.php b/application/models/system/Appdaten_model.php
new file mode 100644
index 000000000..e00e0dce8
--- /dev/null
+++ b/application/models/system/Appdaten_model.php
@@ -0,0 +1,14 @@
+<?php
+class Appdaten_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_appdaten';
+		$this->pk = 'appdaten_id';
+	}
+}
diff --git a/application/models/system/Benutzerrolle_model.php b/application/models/system/Benutzerrolle_model.php
new file mode 100644
index 000000000..95ca90e71
--- /dev/null
+++ b/application/models/system/Benutzerrolle_model.php
@@ -0,0 +1,14 @@
+<?php
+class Benutzerrolle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_benutzerrolle';
+		$this->pk = 'benutzerberechtigung_id';
+	}
+}
diff --git a/application/models/system/Berechtigung_model.php b/application/models/system/Berechtigung_model.php
new file mode 100644
index 000000000..9bd572614
--- /dev/null
+++ b/application/models/system/Berechtigung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Berechtigung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_berechtigung';
+		$this->pk = 'berechtigung_kurzbz';
+	}
+}
diff --git a/application/models/system/Cronjob_model.php b/application/models/system/Cronjob_model.php
new file mode 100644
index 000000000..e47ea5bef
--- /dev/null
+++ b/application/models/system/Cronjob_model.php
@@ -0,0 +1,14 @@
+<?php
+class Cronjob_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_cronjob';
+		$this->pk = 'cronjob_id';
+	}
+}
diff --git a/application/models/system/Filter_model.php b/application/models/system/Filter_model.php
new file mode 100644
index 000000000..5d44e0052
--- /dev/null
+++ b/application/models/system/Filter_model.php
@@ -0,0 +1,14 @@
+<?php
+class Filter_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_filter';
+		$this->pk = 'filter_id';
+	}
+}
diff --git a/application/models/system/Log_model.php b/application/models/system/Log_model.php
new file mode 100644
index 000000000..8b27f6c53
--- /dev/null
+++ b/application/models/system/Log_model.php
@@ -0,0 +1,14 @@
+<?php
+class Log_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_log';
+		$this->pk = 'log_id';
+	}
+}
diff --git a/application/models/message/Message_model.php b/application/models/system/Message_model.php
similarity index 100%
rename from application/models/message/Message_model.php
rename to application/models/system/Message_model.php
diff --git a/application/models/system/Rolle_model.php b/application/models/system/Rolle_model.php
new file mode 100644
index 000000000..5ba085853
--- /dev/null
+++ b/application/models/system/Rolle_model.php
@@ -0,0 +1,14 @@
+<?php
+class Rolle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_rolle';
+		$this->pk = 'rolle_kurzbz';
+	}
+}
diff --git a/application/models/system/Rolleberechtigung_model.php b/application/models/system/Rolleberechtigung_model.php
new file mode 100644
index 000000000..0b08da1ca
--- /dev/null
+++ b/application/models/system/Rolleberechtigung_model.php
@@ -0,0 +1,14 @@
+<?php
+class Rolleberechtigung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_rolleberechtigung';
+		$this->pk = array('rolle_kurzbz', 'berechtigung_kurzbz');
+	}
+}
diff --git a/application/models/system/Server_model.php b/application/models/system/Server_model.php
new file mode 100644
index 000000000..9dd9a7dc9
--- /dev/null
+++ b/application/models/system/Server_model.php
@@ -0,0 +1,14 @@
+<?php
+class Server_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_server';
+		$this->pk = ;
+	}
+}
diff --git a/application/models/core/Sprache_model.php b/application/models/system/Sprache_model.php
similarity index 67%
rename from application/models/core/Sprache_model.php
rename to application/models/system/Sprache_model.php
index 523bf1b87..30736f0c8 100644
--- a/application/models/core/Sprache_model.php
+++ b/application/models/system/Sprache_model.php
@@ -1,16 +1,14 @@
 <?php
-
 class Sprache_model extends DB_Model
 {
 
-	
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable='public.tbl_sprache';
-		$this->pk='sprache';
+		$this->dbTable = 'public.tbl_sprache';
+		$this->pk = 'sprache';
 	}
 }
diff --git a/application/models/system/Tag_model.php b/application/models/system/Tag_model.php
new file mode 100644
index 000000000..94434da45
--- /dev/null
+++ b/application/models/system/Tag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Tag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_tag';
+		$this->pk = 'tag';
+	}
+}
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
new file mode 100644
index 000000000..9800999fe
--- /dev/null
+++ b/application/models/system/Variable_model.php
@@ -0,0 +1,14 @@
+<?php
+class Variable_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_variable';
+		$this->pk = array('uid', 'name');
+	}
+}
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
new file mode 100644
index 000000000..7e953bb9f
--- /dev/null
+++ b/application/models/system/Vorlage_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vorlage_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_vorlage';
+		$this->pk = 'vorlage_kurzbz';
+	}
+}
diff --git a/application/models/system/Vorlagestudiengang_model.php b/application/models/system/Vorlagestudiengang_model.php
new file mode 100644
index 000000000..24af7353c
--- /dev/null
+++ b/application/models/system/Vorlagestudiengang_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vorlagestudiengang_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_vorlagestudiengang';
+		$this->pk = 'vorlagestudiengang_id';
+	}
+}
diff --git a/application/models/system/Webservicelog_model.php b/application/models/system/Webservicelog_model.php
new file mode 100644
index 000000000..dc45b13a7
--- /dev/null
+++ b/application/models/system/Webservicelog_model.php
@@ -0,0 +1,14 @@
+<?php
+class Webservicelog_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_webservicelog';
+		$this->pk = 'webservicelog_id';
+	}
+}
diff --git a/application/models/system/Webservicerecht_model.php b/application/models/system/Webservicerecht_model.php
new file mode 100644
index 000000000..a5bd036f0
--- /dev/null
+++ b/application/models/system/Webservicerecht_model.php
@@ -0,0 +1,14 @@
+<?php
+class Webservicerecht_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_webservicerecht';
+		$this->pk = 'webservicerecht_id';
+	}
+}
diff --git a/application/models/system/Webservicetyp_model.php b/application/models/system/Webservicetyp_model.php
new file mode 100644
index 000000000..5d989de2a
--- /dev/null
+++ b/application/models/system/Webservicetyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Webservicetyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_webservicetyp';
+		$this->pk = 'webservicetyp_kurzbz';
+	}
+}
diff --git a/application/models/message/message_model_old.php b/application/models/system/message_model_old.php
similarity index 100%
rename from application/models/message/message_model_old.php
rename to application/models/system/message_model_old.php
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
new file mode 100644
index 000000000..748926658
--- /dev/null
+++ b/application/models/testtool/Ablauf_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ablauf_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_ablauf';
+		$this->pk = 'ablauf_id';
+	}
+}
diff --git a/application/models/testtool/Antwort_model.php b/application/models/testtool/Antwort_model.php
new file mode 100644
index 000000000..1594be6c3
--- /dev/null
+++ b/application/models/testtool/Antwort_model.php
@@ -0,0 +1,14 @@
+<?php
+class Antwort_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_antwort';
+		$this->pk = 'antwort_id';
+	}
+}
diff --git a/application/models/testtool/Frage_model.php b/application/models/testtool/Frage_model.php
new file mode 100644
index 000000000..de64c303b
--- /dev/null
+++ b/application/models/testtool/Frage_model.php
@@ -0,0 +1,14 @@
+<?php
+class Frage_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_frage';
+		$this->pk = 'frage_id';
+	}
+}
diff --git a/application/models/testtool/Gebiet_model.php b/application/models/testtool/Gebiet_model.php
new file mode 100644
index 000000000..202d6a4aa
--- /dev/null
+++ b/application/models/testtool/Gebiet_model.php
@@ -0,0 +1,14 @@
+<?php
+class Gebiet_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_gebiet';
+		$this->pk = 'gebiet_id';
+	}
+}
diff --git a/application/models/testtool/Kategorie_model.php b/application/models/testtool/Kategorie_model.php
new file mode 100644
index 000000000..10e450651
--- /dev/null
+++ b/application/models/testtool/Kategorie_model.php
@@ -0,0 +1,14 @@
+<?php
+class Kategorie_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_kategorie';
+		$this->pk = 'kategorie_kurzbz';
+	}
+}
diff --git a/application/models/testtool/Kriterien_model.php b/application/models/testtool/Kriterien_model.php
new file mode 100644
index 000000000..daf18d3c4
--- /dev/null
+++ b/application/models/testtool/Kriterien_model.php
@@ -0,0 +1,14 @@
+<?php
+class Kriterien_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_kriterien';
+		$this->pk = ;
+	}
+}
diff --git a/application/models/testtool/Pruefling_model.php b/application/models/testtool/Pruefling_model.php
new file mode 100644
index 000000000..da131ba4a
--- /dev/null
+++ b/application/models/testtool/Pruefling_model.php
@@ -0,0 +1,14 @@
+<?php
+class Pruefling_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_pruefling';
+		$this->pk = 'pruefling_id';
+	}
+}
diff --git a/application/models/testtool/Vorschlag_model.php b/application/models/testtool/Vorschlag_model.php
new file mode 100644
index 000000000..853852da2
--- /dev/null
+++ b/application/models/testtool/Vorschlag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Vorschlag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'testtool.tbl_vorschlag';
+		$this->pk = 'vorschlag_id';
+	}
+}