diff --git a/Dokumentation/Konzept.docx b/Dokumentation/Konzept.docx
deleted file mode 100644
index 2b3f48b..0000000
Binary files a/Dokumentation/Konzept.docx and /dev/null differ
diff --git a/Dokumentation/Kriterien.docx b/Dokumentation/Kriterien.docx
deleted file mode 100644
index 5286482..0000000
Binary files a/Dokumentation/Kriterien.docx and /dev/null differ
diff --git a/Dokumentation/ueber iVote.docx b/Dokumentation/ueber iVote.docx
deleted file mode 100644
index 023205a..0000000
Binary files a/Dokumentation/ueber iVote.docx and /dev/null differ
diff --git a/uVote/api/api_uvote.php b/uVote/api/api_uvote.php
deleted file mode 100644
index 7af1c13..0000000
--- a/uVote/api/api_uvote.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-class api_uvote extends \SYSTEM\API\api_system {
-    //votes
-    public static function call_vote_action_vote($poll_ID, $vote) {
-        return votes::write_vote($poll_ID, $vote);}
-        
-    public static function call_vote_action_data($location, $birthyear, $gender, $children) {
-        return votes::write_data($location, $birthyear, $gender, $children);}        
-    
-    public static function call_vote_action_new_vote($ID, $title, $iframe_link) {
-        return votes::write_poll($ID, $title, $iframe_link);}
-    
-    public static function call_vote_action_feedback($feedback) {
-        return votes::write_feedback($feedback);}
-    
-    public static function call_vote_action_open_vote($poll_ID) {
-        return votes::open_vote($poll_ID);}
-        
-    public static function call_vote_action_barsperusers($poll_ID){
-        return votes::get_barsperusers($poll_ID);}
-   
-    public static function call_vote_action_submit($poll_ID) {
-        return votes::vote_submit($poll_ID);}
-    public static function call_vote_action_accord($party){
-        return votes::vote_accord_with_party($party);}
-    
-    //graphs
-    public static function call_graph_bt_to_uvote_overall_by_time($timespan = 84600){
-        return graphs::graph_bt_to_uvote_overall_by_time($timespan);}
-        
-    public static function call_graph_bt_to_user_overall_by_time($timespan = 84600){
-        return graphs::graph_bt_to_user_overall_by_time($timespan);}
-        
-    //comments
-    public static function call_vote_action_comment($poll_ID, $c_choice, $c_txt, $c_src) {
-        return comments::write_comment($poll_ID, $c_choice, $c_txt, $c_src);}
-    
-    public static function call_vote_action_commentrate($c_ID, $val) {
-        return comments::write_commentrate($c_ID, $val);}
-}
diff --git a/uVote/api/autoload.inc.php b/uVote/api/autoload.inc.php
deleted file mode 100644
index 3fced9b..0000000
--- a/uVote/api/autoload.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes','');
\ No newline at end of file
diff --git a/uVote/api/votes/comments.php b/uVote/api/votes/comments.php
deleted file mode 100644
index f7a512a..0000000
--- a/uVote/api/votes/comments.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class comments {
-    public static function getUserComments($poll_ID, $c_choice){
-        return \DBD\UVOTE_GENERATE_COMMENTS_PER_POLL::QA(array($poll_ID, $c_choice));}
-        
-    public static function insertUserComment($c_choice, $poll_ID, $user_ID, $c_txt, $c_src, $timestamp){
-        return \DBD\UVOTE_DATA_USER_COMMENT_INSERT::QI(array($c_choice, $poll_ID, $user_ID, $c_txt, $c_src, $timestamp));}
-        
-    public static function get_commentrate($c_ID, $val){
-        return \DBD\UVOTE_DATA_USER_COMMENTRATE_PER_COMMENT::Q1(array($c_ID, $val));}
-    
-    public static function write_comment($poll_ID, $c_choice, $c_txt, $c_src){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in.");}
-        return \DBD\UVOTE_DATA_USER_COMMENT_INSERT::Q1(array($c_choice, $poll_ID, \SYSTEM\SECURITY\Security::getUser()->id, utf8_encode($c_txt), $c_src));}
-        
-    public static function write_commentrate($c_ID, $val){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in.");}
-        return \DBD\UVOTE_DATA_USER_COMMENTRATE_INSERT::Q1(array($c_ID, \SYSTEM\SECURITY\Security::getUser()->id, $val, $c_ID, \SYSTEM\SECURITY\Security::getUser()->id, $val));}
-}
diff --git a/uVote/api/votes/graphs.php b/uVote/api/votes/graphs.php
deleted file mode 100644
index 1e36272..0000000
--- a/uVote/api/votes/graphs.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class graphs {
-
-    public static function graph_bt_to_uvote_overall_by_time ($timespan = 84600,$returnasjson = true){
-        $result = array();
-        $res = \DBD\UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME::QQ(array($timespan));
-        while ($row = $res->next()){
-            $result[] = array(  0 => $row['day'],
-                                'match' => $row['class_match'] > 0 ? round($row['class_match'] / ($row['class_match']+$row['class_mismatch']),2) : 0,
-                                'mismatch' => $row['class_match'] > 0 ? round($row['class_mismatch'] / ($row['class_match']+$row['class_mismatch']),2) : 0);
-        }
-        return $returnasjson ? SYSTEM\LOG\JsonResult::toString($result) : $result;
-    }
-    
-    public static function graph_bt_to_user_overall_by_time ($timespan = 84600,$returnasjson = true){
-        $result = array();
-        $res = \DBD\UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME::QQ(array($timespan, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id));
-        while ($row = $res->next()){
-            $result[] = array(  0 => $row['day'],
-                                'class_match' => $row['class_match'] / ($row['class_match']+$row['class_mismatch']+1),
-                                'class_mismatch' => $row['class_mismatch'] / ($row['class_match']+$row['class_mismatch']+1));
-        }
-        return $returnasjson ? SYSTEM\LOG\JsonResult::toString($result) : $result;
-    }
-    
-}
diff --git a/uVote/api/votes/should_be_in_backend.php b/uVote/api/votes/should_be_in_backend.php
deleted file mode 100644
index d382206..0000000
--- a/uVote/api/votes/should_be_in_backend.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class should_be_in_backend {
-    public static function insertPartyChoice($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice){
-        return \DBD\UVOTE_GENERATE_VOTELIST::QI(array($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice));}
-        
-    public static function write_poll($ID, $title, $iframe_link ){  
-        if ($ID == -1){
-            return \DBD\UVOTE_DATA_NEW_POLL::QI(array($title, $iframe_link));
-        }
-        return \DBD\UVOTE_DATA_UPDATE_POLL::QI(array($title, $iframe_link, $ID));
-    }
-}
diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
deleted file mode 100644
index 1cb4c1b..0000000
--- a/uVote/api/votes/votes.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-class votes {
-    public static function getAllVotesOfGroup($groupid){
-        return \DBD\UVOTE_GENERATE_VOTELIST::QA(array($groupid));}
-    
-    public static function getAllExpVotesOfGroup($groupid){
-        return \DBD\UVOTE_GENERATE_VOTELIST_EXP::QA(array($groupid));}        
-    
-    public static function countAllPolls(){
-        $res = \DBD\UVOTE_DATA_COUNT_VOTES::QQ();
-        return $res;}                    
-    
-    public static function get_user_choice_per_poll($poll_ID, $user_ID){
-        return \DBD\UVOTE_DATA_USER_CHOICE_PER_POLL::Q1(array($poll_ID, $user_ID));
-    }
-    
-    public static function getUserPollData($poll_ID){
-        if (!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            return NULL;}
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-        $res = $con->prepare(   'selVoteByGrp',
-                                'SELECT * FROM `uvote_data` WHERE `user_ID` = ? AND poll_ID = ?;',
-                                array(\SYSTEM\SECURITY\Security::getUser()->id,$poll_ID));        
-        $result = $res->next();                                        
-        return $result['choice'];            
-    }
-    
-    public static function get_barsperusers($poll_ID,$return_as_json = true){
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-        //count
-        $res = $con->prepare(  'selVoteBy_count',
-                                'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ?;',
-                                array($poll_ID));
-        $res = $res->next();
-        $result = array();
-        $result['poll_ID'] = $poll_ID;
-        $result['count'] = $res['count'] >= 1 ? $res['count'] : 1;
-        //yes
-        $res = $con->prepare(  'selVoteBy_count',
-                                'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ? AND choice = 1;',
-                                array($poll_ID));
-        $res = $res->next();
-        $result['yes'] = $res['count'];
-        
-        $result['yes_perc'] = $res['count'] / $result['count'];
-        //no
-        $res = $con->prepare(  'selVoteBy_count',
-                                'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ? AND choice = 2;',
-                                array($poll_ID));
-        $res = $res->next();
-        $result['no'] = $res['count'];
-        $result['no_perc'] = $res['count'] / $result['count'];
-        //ent
-        $res = $con->prepare(  'selVoteBy_count',
-                                'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ? AND choice = 3;',
-                                array($poll_ID));
-        $res = $res->next();
-        $result['ent'] = $res['count'];
-        $result['ent_perc'] = $res['count'] / $result['count'];
-        
-        return $return_as_json ? JsonResult::toString($result) : $result;
-    }
-    
-    public static function get_all_votes(){
-        $res = \DBD\UVOTE_DATA_CHOICE_OVERALL::QA();
-        return $res;
-    }
-    
-    public static function get_all_votes_bt(){
-        $res = \DBD\UVOTE_DATA_CHOICE_BT_OVERALL::QA();
-        return $res;
-    }
-    
-    public static function get_user_temp_votes($user_ID){
-        return \DBD\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID, $user_ID));}
-    
-    public static function get_user_overall_votes($user_ID, $creationDate){
-        return \DBD\UVOTE_DATA_OVERALL_VOTES::Q1(array($user_ID, $user_ID, $user_ID, $creationDate));}
-    
-    public static function get_bar_bt_per_poll($poll_ID){
-        return \DBD\UVOTE_DATA_BT_PER_POLL::Q1(array($poll_ID));}
-    
-    public static function get_user_count(){
-        return \DBD\UVOTE_DATA_USER_COUNT_USERS::Q1(array());}        
-    
-    public static function get_count_user_votes_per_poll($poll_ID){
-        return \DBD\UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL::Q1(array($poll_ID));}
-    
-    public static function get_user_per_party_overall($user_ID){
-        return \DBD\UVOTE_DATA_USER_PER_PARTY_OVERALL::QA(array($user_ID));        
-    }
-    public static function get_user_to_bt_overall($user_ID){
-        return \DBD\UVOTE_DATA_USER_TO_BT::QA(array($user_ID));        
-    }
-    
-    public static function get_uvote_to_bt_overall(){
-        return \DBD\UVOTE_DATA_UVOTE_TO_PARTY_OVERALL::QA(array());        
-    }
-
-    public static function vote_accord_with_party($party){        
-        if (!\SYSTEM\SECURITY\Security::isloggedin()){
-            throw new ERROR("U need to be logged in....sry bro / sis");}
-        $user = \SYSTEM\SECURITY\Security::getUser()->id;                
-        $data = \DBD\UVOTE_ACCORD_WITH_FRACTION::QA(array($party,$user));
-        //$data_escaped = array_walk_recursive($data, 'mysql_real_escape_string');        
-        return \SYSTEM\LOG\JsonResult::toString($data);                
-    }
-    public static function get_users_choice_per_poll($poll_ID){
-        return \DBD\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));}
-        
-    public static function get_pfields_per_poll($poll_ID){
-        return \DBD\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));}
-    
-    public static function get_voteinfo($poll_ID){
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-        $res = $con->prepare(   'selVoteByID',
-                                'SELECT * FROM `uvote_votes` WHERE `ID` = ?;',
-                                array($poll_ID));        
-        $res = $res->next();
-//        $res['title'] = utf8_encode($res['title']);
-        return $res;
-    }
-    
-    public static function get_barsperparty($poll_ID){
-        return \DBD\UVOTE_DATA_PARTY_PER_POLL::QA(array($poll_ID));}
-        
-    public static function get_party_choice($poll_ID, $party){
-        $res = \DBD\UVOTE_DATA_PARTY_CHOICE_PER_POLL::Q1(array($poll_ID, $party));
-        return $res;                            
-    }
-    
-    public static function write_vote($poll_ID, $vote){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in.");}
-            
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-        $res = $con->prepare(   'selVote',
-                                'SELECT * FROM `uvote_votes` WHERE `ID` = ? AND time_end < CURDATE();',
-                                array($poll_ID));
-         if ($res->next()){
-             throw new ERROR('Your rights have expired!');}
-                     
-        $res = $con->prepare(   'insertVote',
-                                'REPLACE uvote_data
-                                 VALUES (?, ?, ?, 0, NOW());', 
-                                array($poll_ID, \SYSTEM\SECURITY\Security::getUser()->id, $vote));   
-        return JsonResult::ok();
-    }
-    
-    public static function write_data($location, $birthyear, $gender, $children){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in.");}          
-        return \DBD\UVOTE_DATA_USER_ADD_DATA_INSERT::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id, $location, $birthyear, $gender, $children, \SYSTEM\SECURITY\Security::getUser()->id, $location, $birthyear, $gender, $children));}                                              
-        
-    public static function get_add_data(){
-        return \DBD\UVOTE_DATA_USER_ADD_DATA::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id)); 
-    }    
-    
-    public static function write_feedback($feedback){
-        $feedback = json_decode($feedback);
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in.");}
-            
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());                    
-        $res = $con->prepare(   'insertFeedback',
-                                'INSERT INTO uvote_beta_feedback
-                                 VALUES (?, ?);',
-                                array(\SYSTEM\SECURITY\Security::getUser()->id, $feedback));   
-        new WARNING("feedback was added");
-        return JsonResult::ok();
-    }
-    
-    public static function open_vote($poll_ID){
-        $vote = self::get_voteinfo($poll_ID); //votes::getVoteOfGroup($poll_ID);
-        $result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/full_vote.tpl'), $vote);
-        return $result;
-    }
-}
diff --git a/uVote/autoload.inc.php b/uVote/autoload.inc.php
deleted file mode 100644
index 3aa2250..0000000
--- a/uVote/autoload.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-//keep this
-require_once dirname(__FILE__).'/path/register_path_classes.php';
-require_once dirname(__FILE__).'/page/register_page_classes.php';
-require_once dirname(__FILE__).'/dbd/autoload.inc.php';
-require_once dirname(__FILE__).'/files/autoload.inc.php';
-require_once dirname(__FILE__).'/api/autoload.inc.php';
\ No newline at end of file
diff --git a/uVote/dbd/autoload.inc.php b/uVote/dbd/autoload.inc.php
deleted file mode 100644
index 86529c2..0000000
--- a/uVote/dbd/autoload.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','DBD');
-//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
-//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
-//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
\ No newline at end of file
diff --git a/uVote/dbd/db/uVote.php b/uVote/dbd/db/uVote.php
deleted file mode 100644
index 936ec7b..0000000
--- a/uVote/dbd/db/uVote.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace DBD;
-
-class uVote extends \SYSTEM\DB\DBInfoMYS {
-
-    public function  __construct() {
-        parent::__construct('host_uVote', 'mojotrolls_dev', 'dsjgfasudzfsvad', '127.0.0.1');}
-}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_ACCORD_WITH_FRACTION.php b/uVote/dbd/qq/UVOTE_ACCORD_WITH_FRACTION.php
deleted file mode 100644
index fa3d1cd..0000000
--- a/uVote/dbd/qq/UVOTE_ACCORD_WITH_FRACTION.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-namespace DBD;
-class UVOTE_ACCORD_WITH_FRACTION extends  \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'   SELECT v.*, d.choice as user_choice, p.choice as party_choice
-    FROM uvote_data as d
-    LEFT JOIN uvote_votes as v
-        ON d.poll_ID = v.ID
-    LEFT JOIN uvote_votes_per_party as p
-        ON v.ID = p.poll_ID
-    WHERE p.party = ?
-	 AND d.user_ID = ?  AND d.choice = p.choice;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_ALL_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_ALL_VOTES.php
deleted file mode 100644
index ab04ea3..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_ALL_VOTES.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_ALL_VOTES extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) FROM uvote_data;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_BT_INSERT.php b/uVote/dbd/qq/UVOTE_DATA_BT_INSERT.php
deleted file mode 100644
index 056d717..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_BT_INSERT.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_BT_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'INSERT INTO uvote_votes_per_party 
-    (poll_ID, party, votes_pro, votes_contra, nr_attending, total, choice) 
-    VALUES (?, ?, ?, ?, ?, ?, ?);'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php
deleted file mode 100644
index acf9cd4..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_BT_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT 
-    sum(votes_pro) as bt_pro, 
-    sum(votes_contra) as bt_con, 
-    sum(nr_attending) as bt_attending, 
-    sum(total) as bt_total
-FROM uvote_votes_per_party WHERE poll_ID = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_CHOICE_BT_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_CHOICE_BT_OVERALL.php
deleted file mode 100644
index b096ef1..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_CHOICE_BT_OVERALL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_CHOICE_BT_OVERALL extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) as "count", bt_choice FROM uvote_votes GROUP BY bt_choice;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_CHOICE_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_CHOICE_OVERALL.php
deleted file mode 100644
index 145c5f6..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_CHOICE_OVERALL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_CHOICE_OVERALL extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) as "count", choice FROM uvote_data GROUP BY choice;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php
deleted file mode 100644
index 4cb3aea..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT
-	DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(a.`timestamp`) - MOD(UNIX_TIMESTAMP(a.`timestamp`),?)),"%Y/%m/%d %H:%i:%s") as day,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 1 ELSE 0 END) class_match,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 0 ELSE 1 END) class_mismatch
-FROM uvote_data as a
-LEFT JOIN (Select choice, poll_ID FROM uvote_data WHERE user_ID = ? GROUP BY choice LIMIT 1) b ON a.poll_ID = b.poll_ID
-LEFT JOIN uvote_votes as c ON a.poll_ID = c.ID
-WHERE bt_choice AND user_ID = ?
-GROUP BY day;'
-);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php
deleted file mode 100644
index 4ce5330..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT
-	DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(a.`timestamp`) - MOD(UNIX_TIMESTAMP(a.`timestamp`),?)),"%Y/%m/%d %H:%i:%s") as day,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 1 ELSE 0 END) class_match,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 0 ELSE 1 END) class_mismatch
-FROM uvote_data as a
-LEFT JOIN (Select choice, poll_ID FROM uvote_data GROUP BY choice LIMIT 1) b ON a.poll_ID = b.poll_ID
-LEFT JOIN uvote_votes as c ON a.poll_ID = c.ID
-WHERE bt_choice
-GROUP BY day;'
-);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php b/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php
deleted file mode 100644
index 695c188..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_NEW_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'INSERT INTO `uvote_votes` (`title`, `iframe_link`) 
-    VALUES (?, ?);'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_OVERALL_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_OVERALL_VOTES.php
deleted file mode 100644
index 0ea7227..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_OVERALL_VOTES.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_OVERALL_VOTES extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT SUM(CASE WHEN uvote_data.user_ID = ? THEN 1 ELSE 0 END) as voted,
-        SUM(CASE WHEN uvote_data.user_ID = ? THEN 0 ELSE 1 END) AS not_voted 
-FROM uvote_data RIGHT JOIN uvote_votes ON ( uvote_data.poll_ID  = uvote_votes.ID AND uvote_data.user_ID = ?)
-WHERE time_start > FROM_UNIXTIME(?);'
-);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_PARTY_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_PARTY_CHOICE_PER_POLL.php
deleted file mode 100644
index 8998286..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_PARTY_CHOICE_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_PARTY_CHOICE_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT `choice` FROM `uvote_votes_per_party` WHERE `poll_ID` = ? AND `party` = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
deleted file mode 100644
index 47215fb..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_PARTY_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ? ORDER BY party;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_PFIELDS_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_PFIELDS_PER_POLL.php
deleted file mode 100644
index e4acac7..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_PFIELDS_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_PFIELDS_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) as count, choice FROM uvote_data WHERE `poll_ID` = ? GROUP BY choice ORDER BY count DESC;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php
deleted file mode 100644
index 77959ae..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_TEMP_VOTES extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT SUM(CASE WHEN uvote_data.user_ID = ? THEN 1 ELSE 0 END) as voted,
-        SUM(CASE WHEN uvote_data.user_ID = ? THEN 0 ELSE 1 END) AS not_voted 
-FROM uvote_data RIGHT JOIN uvote_votes ON ( uvote_data.poll_ID  = uvote_votes.ID AND uvote_data.user_ID = ?)
-WHERE time_end > NOW();'
-);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_UPDATE_POLL.php b/uVote/dbd/qq/UVOTE_DATA_UPDATE_POLL.php
deleted file mode 100644
index fe59a38..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_UPDATE_POLL.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_UPDATE_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'UPDATE `uvote_votes` SET `title` = ?, `iframe_link` = ?
-    WHERE ID = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
deleted file mode 100644
index 289442e..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USERS_CHOICE_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) as count, choice FROM uvote_data WHERE `poll_ID` = ? GROUP BY choice ORDER BY count DESC, choice;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA.php b/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA.php
deleted file mode 100644
index 0113d2c..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_ADD_DATA extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM uvote_user_additional WHERE `user_ID` = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA_INSERT.php b/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA_INSERT.php
deleted file mode 100644
index 3a65711..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_ADD_DATA_INSERT.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_ADD_DATA_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'INSERT INTO `uvote_user_additional` (`user_ID`, `location`, `birthyear`, `gender`, `children`) VALUES (?, ?, ?, ?, ?) 
-    ON DUPLICATE KEY UPDATE user_ID = ?, location = ?, birthyear = ?, gender = ?, children = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_USER_CHOICE_PER_POLL.php
deleted file mode 100644
index 02aeb6d..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_CHOICE_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_CHOICE_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_data` WHERE poll_ID = ? AND `user_ID` = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php b/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php
deleted file mode 100644
index e31e1f6..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_COMMENTRATE_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'INSERT INTO `uvote_user_comments_additional`  (`c_ID`, `user_ID`, `val`, `timestamp`) VALUES (?, ?, ?, NOW()) ON DUPLICATE KEY UPDATE `c_ID` = ?, `user_ID` = ?, `val` = ?, `timestamp` = NOW();'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_PER_COMMENT.php b/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_PER_COMMENT.php
deleted file mode 100644
index d9bf991..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_PER_COMMENT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_COMMENTRATE_PER_COMMENT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) as count FROM uvote_user_comments_additional where c_ID = ? AND val = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENT_INSERT.php b/uVote/dbd/qq/UVOTE_DATA_USER_COMMENT_INSERT.php
deleted file mode 100644
index 6785731..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENT_INSERT.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_COMMENT_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'INSERT INTO `uvote_user_comments` (`c_choice`, `poll_ID`, `user_ID`, `c_txt`, `c_src`, `timestamp`) 
-    VALUES (?, ?, ?, ?, ?, NOW());'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php
deleted file mode 100644
index a682924..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) AS count FROM uvote_data WHERE `poll_ID` = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_USERS.php b/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_USERS.php
deleted file mode 100644
index 21c5bca..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_USERS.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_COUNT_USERS extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT COUNT(*) AS count FROM system_user;'
-);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
deleted file mode 100644
index e9b774f..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_PER_PARTY_OVERALL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT party, sum(case when uvote_data.choice = uvote_votes_per_party.choice then 1 else 0 end) class_MATCH,
-		 sum(case when uvote_data.choice = uvote_votes_per_party.choice then 0 else 1 end) class_MISSMATCH 
-FROM uvote_data INNER JOIN uvote_votes_per_party 
-ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
-WHERE user_ID = ? GROUP BY party;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php b/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php
deleted file mode 100644
index 3cb98da..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_TO_BT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH,
-		 sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH 
-FROM uvote_data LEFT JOIN uvote_votes 
-ON uvote_data.poll_ID = uvote_votes.ID 
-WHERE user_ID = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php
deleted file mode 100644
index a07aac5..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_USER_TO_PARTY_OVERALL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT sum(case when uvote_data.choice = uvote_votes_per_party.choice then 1 else 0 end) class_MATCH,
-		 sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH 
-FROM uvote_data LEFT JOIN uvote_votes_per_party 
-ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
-WHERE party = ?;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_UVOTE_TO_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_UVOTE_TO_PARTY_OVERALL.php
deleted file mode 100644
index 8ad7f59..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_UVOTE_TO_PARTY_OVERALL.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_DATA_UVOTE_TO_PARTY_OVERALL extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT party, sum(case when uvote_data.choice = uvote_votes_per_party.choice then 1 else 0 end) class_MATCH,
-                                               sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH 
-                                FROM uvote_data INNER JOIN uvote_votes_per_party 
-                                    ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID GROUP BY party;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_GENERATE_COMMENTS_PER_POLL.php b/uVote/dbd/qq/UVOTE_GENERATE_COMMENTS_PER_POLL.php
deleted file mode 100644
index 77a2a9f..0000000
--- a/uVote/dbd/qq/UVOTE_GENERATE_COMMENTS_PER_POLL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_GENERATE_COMMENTS_PER_POLL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_user_comments` WHERE `poll_ID` = ? AND c_choice = ? ORDER BY (txt_up-txt_down) ASC;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php
deleted file mode 100644
index 3fc59c8..0000000
--- a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_GENERATE_VOTELIST extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_votes` WHERE `group` = ? AND time_end > NOW() ORDER BY (time_end-time_start) ASC;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST_EXP.php b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST_EXP.php
deleted file mode 100644
index 232dabb..0000000
--- a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST_EXP.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_GENERATE_VOTELIST_EXP extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_votes` WHERE `group` = ? AND time_end < NOW() ORDER BY (time_end-time_start) ASC;'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_POLL_EXPIRED.php b/uVote/dbd/qq/UVOTE_POLL_EXPIRED.php
deleted file mode 100644
index 7ead18b..0000000
--- a/uVote/dbd/qq/UVOTE_POLL_EXPIRED.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace DBD;
-
-class UVOTE_POLL_EXPIRED extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT * FROM `uvote_votes` WHERE `ID` = ? AND time_end > CURDATE();'
-);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch.sql b/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch.sql
deleted file mode 100644
index 451a5f6..0000000
--- a/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 1 ELSE 0 END) class_match,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 0 ELSE 1 END) class_mismatch
-FROM uvote_data as a
-LEFT JOIN (Select choice, poll_ID FROM uvote_data GROUP BY choice LIMIT 1) b ON a.poll_ID = b.poll_ID
-LEFT JOIN uvote_votes as c ON a.poll_ID = c.ID
-WHERE bt_choice
\ No newline at end of file
diff --git a/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch_group_by_day.sql b/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch_group_by_day.sql
deleted file mode 100644
index b54fa5d..0000000
--- a/uVote/dbd/qq/select_bt_vs_uvote_overall_match_missmatch_group_by_day.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-SELECT
-	DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(a.`timestamp`) - MOD(UNIX_TIMESTAMP(a.`timestamp`),86400)),"%Y/%m/%d %H:%i:%s") as day,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 1 ELSE 0 END) class_match,
-	SUM(CASE WHEN  a.choice = c.bt_choice THEN 0 ELSE 1 END) class_mismatch
-FROM uvote_data as a
-LEFT JOIN (Select choice, poll_ID FROM uvote_data GROUP BY choice LIMIT 1) b ON a.poll_ID = b.poll_ID
-LEFT JOIN uvote_votes as c ON a.poll_ID = c.ID
-WHERE bt_choice
-GROUP BY day
\ No newline at end of file
diff --git a/uVote/dbd/qq/select_user_voted_notvoted_overall.sql b/uVote/dbd/qq/select_user_voted_notvoted_overall.sql
deleted file mode 100644
index 9c4f4e5..0000000
--- a/uVote/dbd/qq/select_user_voted_notvoted_overall.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT SUM(CASE WHEN uvote_data.user_ID = 15 THEN 1 ELSE 0 END) as voted,
-		 SUM(CASE WHEN uvote_data.user_ID = 15 THEN 0 ELSE 1 END) as not_voted FROM uvote_data RIGHT JOIN uvote_votes ON ( uvote_data.poll_ID  = uvote_votes.ID AND uvote_data.user_ID = 15);
\ No newline at end of file
diff --git a/uVote/dbd/tbl/locale_string.php b/uVote/dbd/tbl/locale_string.php
deleted file mode 100644
index c5cfeb2..0000000
--- a/uVote/dbd/tbl/locale_string.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace DBD;
-
-class locale_string extends \SYSTEM\DBD\system_locale_string {
-
-const VALUE_CATEGORY_MAINPAGE = 100;
-
-}
\ No newline at end of file
diff --git a/uVote/files/autoload.inc.php b/uVote/files/autoload.inc.php
deleted file mode 100644
index d5d86c0..0000000
--- a/uVote/files/autoload.inc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/frontend_logos/','frontend_logos','*.png');
\ No newline at end of file
diff --git a/uVote/files/frontend_logos/background.png b/uVote/files/frontend_logos/background.png
deleted file mode 100644
index bc7671c..0000000
Binary files a/uVote/files/frontend_logos/background.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/bild_8.png b/uVote/files/frontend_logos/bild_8.png
deleted file mode 100644
index d872d8a..0000000
Binary files a/uVote/files/frontend_logos/bild_8.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/chrome.png b/uVote/files/frontend_logos/chrome.png
deleted file mode 100644
index 5aed0f3..0000000
Binary files a/uVote/files/frontend_logos/chrome.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/chrome.psd b/uVote/files/frontend_logos/chrome.psd
deleted file mode 100644
index 7fbc6c9..0000000
Binary files a/uVote/files/frontend_logos/chrome.psd and /dev/null differ
diff --git a/uVote/files/frontend_logos/contra.png b/uVote/files/frontend_logos/contra.png
deleted file mode 100644
index 46aff79..0000000
Binary files a/uVote/files/frontend_logos/contra.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/cover.png b/uVote/files/frontend_logos/cover.png
deleted file mode 100644
index a0ae1c0..0000000
Binary files a/uVote/files/frontend_logos/cover.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/cover.psd b/uVote/files/frontend_logos/cover.psd
deleted file mode 100644
index 8161d92..0000000
Binary files a/uVote/files/frontend_logos/cover.psd and /dev/null differ
diff --git a/uVote/files/frontend_logos/cover2.png b/uVote/files/frontend_logos/cover2.png
deleted file mode 100644
index 691f7ab..0000000
Binary files a/uVote/files/frontend_logos/cover2.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/enth.png b/uVote/files/frontend_logos/enth.png
deleted file mode 100644
index 568d702..0000000
Binary files a/uVote/files/frontend_logos/enth.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_bt.png b/uVote/files/frontend_logos/icon_bt.png
deleted file mode 100644
index 2d82670..0000000
Binary files a/uVote/files/frontend_logos/icon_bt.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_cdu.png b/uVote/files/frontend_logos/icon_cdu.png
deleted file mode 100644
index fa7106b..0000000
Binary files a/uVote/files/frontend_logos/icon_cdu.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_cdu1.png b/uVote/files/frontend_logos/icon_cdu1.png
deleted file mode 100644
index 2463565..0000000
Binary files a/uVote/files/frontend_logos/icon_cdu1.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_csu.png b/uVote/files/frontend_logos/icon_csu.png
deleted file mode 100644
index 2746d0e..0000000
Binary files a/uVote/files/frontend_logos/icon_csu.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_csu1.png b/uVote/files/frontend_logos/icon_csu1.png
deleted file mode 100644
index 5c7838c..0000000
Binary files a/uVote/files/frontend_logos/icon_csu1.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_gruene.png b/uVote/files/frontend_logos/icon_gruene.png
deleted file mode 100644
index e16b455..0000000
Binary files a/uVote/files/frontend_logos/icon_gruene.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_gruene1.png b/uVote/files/frontend_logos/icon_gruene1.png
deleted file mode 100644
index 9616885..0000000
Binary files a/uVote/files/frontend_logos/icon_gruene1.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_linke.png b/uVote/files/frontend_logos/icon_linke.png
deleted file mode 100644
index 9cfcf07..0000000
Binary files a/uVote/files/frontend_logos/icon_linke.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_linke1.png b/uVote/files/frontend_logos/icon_linke1.png
deleted file mode 100644
index e48df94..0000000
Binary files a/uVote/files/frontend_logos/icon_linke1.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_party.psd b/uVote/files/frontend_logos/icon_party.psd
deleted file mode 100644
index 1fa9c3a..0000000
Binary files a/uVote/files/frontend_logos/icon_party.psd and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_spd.png b/uVote/files/frontend_logos/icon_spd.png
deleted file mode 100644
index 1cf7f52..0000000
Binary files a/uVote/files/frontend_logos/icon_spd.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_spd1.png b/uVote/files/frontend_logos/icon_spd1.png
deleted file mode 100644
index ba91f67..0000000
Binary files a/uVote/files/frontend_logos/icon_spd1.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_urn_con.png b/uVote/files/frontend_logos/icon_urn_con.png
deleted file mode 100644
index c9fdf8c..0000000
Binary files a/uVote/files/frontend_logos/icon_urn_con.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_urn_ent.png b/uVote/files/frontend_logos/icon_urn_ent.png
deleted file mode 100644
index 261585a..0000000
Binary files a/uVote/files/frontend_logos/icon_urn_ent.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_urn_open.png b/uVote/files/frontend_logos/icon_urn_open.png
deleted file mode 100644
index d73fb50..0000000
Binary files a/uVote/files/frontend_logos/icon_urn_open.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/icon_urn_pro.png b/uVote/files/frontend_logos/icon_urn_pro.png
deleted file mode 100644
index 2962485..0000000
Binary files a/uVote/files/frontend_logos/icon_urn_pro.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/logo.jpg b/uVote/files/frontend_logos/logo.jpg
deleted file mode 100644
index 0b41b0f..0000000
Binary files a/uVote/files/frontend_logos/logo.jpg and /dev/null differ
diff --git a/uVote/files/frontend_logos/logo2.png b/uVote/files/frontend_logos/logo2.png
deleted file mode 100644
index e2e514e..0000000
Binary files a/uVote/files/frontend_logos/logo2.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/pro.png b/uVote/files/frontend_logos/pro.png
deleted file mode 100644
index 0255fd0..0000000
Binary files a/uVote/files/frontend_logos/pro.png and /dev/null differ
diff --git a/uVote/files/frontend_logos/vote_background.psd b/uVote/files/frontend_logos/vote_background.psd
deleted file mode 100644
index 92dbae0..0000000
Binary files a/uVote/files/frontend_logos/vote_background.psd and /dev/null differ
diff --git a/uVote/files/register_files.php b/uVote/files/register_files.php
deleted file mode 100644
index 71d7cdc..0000000
--- a/uVote/files/register_files.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/frontend_logos/','frontend_logos','*.png');
diff --git a/uVote/page/default_bulletin/bars_user.tpl b/uVote/page/default_bulletin/bars_user.tpl
deleted file mode 100644
index a502a85..0000000
--- a/uVote/page/default_bulletin/bars_user.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h5>${bulletin_bars_title}</h5>
-${urvote_bars_user}
-    <div class="progress" id="progress_bars_user">
-      <div class="bar bar-success" style="width: ${vote_yes_perc}%;">${vote_yes_perc}%</div>
-      <div class="bar bar-danger" style="width: ${vote_no_perc}%;">${vote_no_perc}%</div>
-      <div class="bar bar-info" style="width: ${vote_ent_perc}%;">${vote_ent_perc}%</div>
-    </div>
diff --git a/uVote/page/default_bulletin/bulletin.tpl b/uVote/page/default_bulletin/bulletin.tpl
deleted file mode 100644
index 1c6a945..0000000
--- a/uVote/page/default_bulletin/bulletin.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<div id="bulletin_main"> 
-    <h4>${title}</h4>
-    ${vote_buttons}
-    <div id="bulletin_left">
-        <img src="${frontend_logos}icon_urn_${vote_class}.png"/>
-    </div>
-    <div id="bulletin_sub1">
-        ${openvote_help_text}
-        ${title}
-        ${openvote_help_text1}
-    </div>
-    <div>
-        ${voice_weight}
-    </div>
-    <div id="bulletin_sub2"> 
-           ${bars_user}<br>      
-           ${bars_bt}
-    </div>
-    <div id="bulletin_sub3">   
-        ${icons_party}
-        ${choice_party}
-    </div>
-    <div id="divider"></div>
-    <br>
-    <div id="bulletin_sub4">
-    <h4>Kommentare</h4>
-    <div id="bulletin_sub5">
-        <div id="bulletin_sub5_sub">
-            <h5>Pro</h5>
-            ${comments_pro}
-        </div>
-        <div id="bulletin_sub6">
-            <h5>Contra</h5>
-            ${comments_con}
-        </div>
-    </div>
-        <div id="bulletin_sub7"></div>
-        <div>
-            <font size="2">Kommentar</font><br>
-            <textarea id="c_txt_pro"></textarea><br>
-            <font size="2">Quelle</font><br>
-            <input type="text" id="c_src_pro" placeholder="optional"/><br>
-            <select id="side_select" name="side_select">
-                <option>Seite</option>
-                <option value="1">Argument Pro</option>
-                <option value="2">Argument Con</option>
-            </select><br>
-            <div class="btn btn-primary submit_pro" id="submit_pro" poll_ID="${poll_ID}">${submit}</div>  
-    </div>
-    </div>
-
-
-<!--<div class="btn" id="test">
-    test
-</div>
--->
-
-</div><!-- /.modal -->
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/comment.tpl b/uVote/page/default_bulletin/comment.tpl
deleted file mode 100644
index e0450f9..0000000
--- a/uVote/page/default_bulletin/comment.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="comment_main">
-<div id="comment_sub1">${timestamp}</div>
-<a style="float: right" class="btn btn-warning btn-mini c_spam" c_ID="${c_ID}"><i class="icon-white icon-exclamation-sign"></i></a>
-<div id="comment_sub2"></div>
-<div>${c_txt}</div>
-<br>
-<div id="comment_sub3">
-    ${count_up}
-    <a class="btn btn-success btn-mini c_up" c_ID="${c_ID}"><i class="icon-white icon-thumbs-up"></i></a>
-    ${count_down}
-    <a class="btn btn-danger btn-mini c_down" c_ID="${c_ID}"><i class="icon-white icon-thumbs-down"></i></a>
-    <div id="comment_sub4">Quelle:<font size="2">${c_src}</font></div>
-</div>
-
-</div>
-
-<br>
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/css/bars_user.css b/uVote/page/default_bulletin/css/bars_user.css
deleted file mode 100644
index 513c5aa..0000000
--- a/uVote/page/default_bulletin/css/bars_user.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.progress#progress_bars_user {
-    height: 20px; 
-    width: 350px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/css/bulletin.css b/uVote/page/default_bulletin/css/bulletin.css
deleted file mode 100644
index 1cb78e3..0000000
--- a/uVote/page/default_bulletin/css/bulletin.css
+++ /dev/null
@@ -1,48 +0,0 @@
-#bulletin_main {
-    float: left; 
-    width: 100%;
-}
-
-#bulletin_left {
-    float: left;
-}
-
-#bulletin_sub1 {
-    margin-top: 30px;
-}
-
-#bulletin_sub2 {
-    float: left; 
-    width: 50%; 
-    padding-top: 30px;
-}
-
-#bulletin_sub3 {
-    float: right; 
-    width: 50%; 
-    padding-top: 30px;
-}
-#divider {
-    clear: both;
-}
-
-#bulletin_sub4 {
-    padding-top: 30px;
-}
-#bulletin_sub5 {
-    padding-top: 20px;
-}
-
-#bulletin_sub5_sub {
-    float: left; 
-    width: 40%;
-}
-
- #bulletin_sub6 {
-     float: right; 
-     width: 40%;
- }
- 
- #bulletin_sub7 {
-     clear: both;
- }
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/css/comment.css b/uVote/page/default_bulletin/css/comment.css
deleted file mode 100644
index 125793f..0000000
--- a/uVote/page/default_bulletin/css/comment.css
+++ /dev/null
@@ -1,22 +0,0 @@
-#comment_main {
-    float: left; 
-    width: 90%;
-}
-
-#comment_sub1 {
-    float: left;
-    font-size: 1;
-}
-
-#comment_sub2 {
-    clear: both;
-}
-
-#comment_sub3 {
-    font-size: 2;
-}
-
-#comment_sub4 {
-    float: right;
-    font-size: 1;
-}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
deleted file mode 100644
index 5d6361b..0000000
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-class default_bulletin extends SYSTEM\PAGE\Page {
-    private $poll_ID = NULL;
-    
-    public function __construct($poll_ID) {
-        $this->poll_ID=$poll_ID;}
-    
-    public function vote_choice(){
-        $vars = votes::getUserPollData($this->poll_ID);
-        return $this->tablerow_class($vars);
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'con';
-            case 3:
-                return 'ent';
-            default:
-                return 'open';
-        }        
-    }
-    
-    private function get_party_per_poll($choice){
-        switch($choice){
-            case 1:
-                return 'PRO';
-            case 2:
-                return 'CON';
-            case 3:
-                return 'ENT';
-            default:
-                return 'NONE';
-        }           
-    }
-  
-    private function choice_party (){
-        $result = '';
-        $party_votes = votes::get_barsperparty($this->poll_ID);
-
-//        $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']);
-        foreach($party_votes as $pv){
-            
-            $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/vote_bt.tpl'),
-                                    array(  'party' => $pv['party'],
-                                            'choice' => $this->get_party_per_poll($pv['choice']),
-                                            'choice_class' => $this->tablerow_class($pv['choice']),
-                                            'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : $pv['votes_pro'],
-                                            'party_no' => $pv['votes_contra'] > 0 ? round($pv['votes_contra']/$pv['total']*100,0) : $pv['votes_contra'],
-                                            'party_off' => $pv['total'] > 0 ? round(($pv['total'] - $pv['nr_attending'])/$pv['total']*100,0) : $pv['total'],
-                                            'party_ent' => $pv['nr_attending'] > 0 ? round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['nr_attending']*100,0) : $pv['nr_attending']));                    
-        }
-        return $result;              
-    }
-    
-    private function get_pro_comments (){
-        $result = '';
-        $vars = votes::getUserComments($this->poll_ID, 1);
-        
-        foreach($vars as $com){
-            $rating = votes::get_commentrate($com['c_ID'], 1);
-            $com['count_up'] = $rating['count'];
-            $rating2 = votes::get_commentrate($com['c_ID'], 2);
-            $com['count_down'] = $rating2['count'];
-//            $com['c_txt'] = utf8_encode($com['c_txt']);
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
-        }
-        return $result;
-    
-    }
-    private function get_con_comments (){
-        $result = '';
-        $vars = votes::getUserComments($this->poll_ID, 2); 
-                     
-        foreach($vars as $com){
-            $rating = votes::get_commentrate($com['c_ID'], 1);
-            $com['count_up'] = $rating['count'];
-            $rating2 = votes::get_commentrate($com['c_ID'], 2);
-            $com['count_down'] = $rating2['count'];
-//            $com['c_txt'] = utf8_encode($com['c_txt']);
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
-        }
-        return $result;
-    
-    }
-    private function bars_user(){
-        $bars = votes::get_barsperusers($this->poll_ID,false);
-        $bars['vote_yes_perc'] = round($bars['yes_perc']*100,0);
-        $bars['vote_no_perc'] = round($bars['no_perc']*100,0);
-        $bars['vote_ent_perc'] = round($bars['ent_perc']*100,0);
-        $bars['title'] = 'Gemessen auf uVote';
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bars_user.tpl'),$bars);
-    }
-    
-    private function bars_party(){
-        $partyvotes = votes::get_barsperparty($this->poll_ID);
-        
-        $result = "";
-        foreach($partyvotes as $vote){
-            $vote['party_yes'] = $vote['votes_pro'] > 0 ? round($vote['votes_pro']/$vote['total']*100,0) : $vote['votes_pro'];
-            $vote['party_no'] = $vote['votes_contra'] > 0 ? round($vote['votes_contra']/$vote['total']*100,0) : $vote['votes_contra'];
-            $vote['party_ent'] = $vote['nr_attending'] > 0 ? round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0) : $vote['nr_attending'];
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_parties.tpl'), $vote);
-        }
-        
-        return $result;
-    }
-    
-    private function icons_party(){
-        $vars = votes::get_bar_bt_per_poll($this->poll_ID);
-        if (!$vars['bt_total']){
-            return '';}
-        $info = array();
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/icons_table_parties.tpl'), $info);
-    }
-    
-    private function bars_bt(){
-        $vars = votes::get_bar_bt_per_poll($this->poll_ID);
-        if (!$vars['bt_total']){
-            return 'Keine Ergebnisse für den Bundestag verfügbar';}
-        $vars['bt_ent'] = round(($vars['bt_attending'] - $vars['bt_pro'] - $vars['bt_con'])/$vars['bt_total']*100,0);
-        $vars['bt_pro'] = round($vars['bt_pro']/$vars['bt_total']*100,0);
-        $vars['bt_con'] = round($vars['bt_con']/$vars['bt_total']*100,0);           
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_bt.tpl'), $vars);
-    }
-    
-    private function voice_weight(){
-        $vars = votes::get_count_user_votes_per_poll($this->poll_ID);
-        $vars['voteweight'] = round(1/$vars['count']*100);      
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/voteweight.tpl'), $vars);
-    }
-    
-    private function p_fields (){
-        $result = "";
-        
-        $list = array   (array(1, 'Aussenpolitik'),
-                        array(2, 'Aussenpolitik'),
-                        array(4, 'Aussenpolitik'),
-                        array(8, 'Aussenpolitik'));
-        foreach($list as $l){
-        if($p_fields & $l[0]) $result .= $l[1];       
-        }
-        return $result;
-    }
-    
-    private function vote_buttons($poll_expired,$user_poll){        
-        if($poll_expired){
-            if(!$user_poll){
-                return '<h5>Stimme hier ab</h5>
-                                     <a class="btn btn-success btn-default btnvote_yes"
-                                        style="width: 70px"                                     
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Pro</font></a>
-                                     <a class="btn btn-danger btn-default btnvote_no" 
-                                        style="width: 70px" 
-                                        href="#" 
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Contra</font></a>
-                                     <a class="btn btn-info btn-default btnvote_off" 
-                                        style="width: 70px" 
-                                        href="#" 
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Enthaltung</font></a>';}
-            $classes = array('','','');
-            switch($user_poll){
-                case 1: $classes = array('btn-success disabled','btn-danger','btn-info'); break;
-                case 2: $classes = array('btn-success','btn-danger disabled','btn-info'); break;
-                case 3: $classes = array('btn-success','btn-danger','btn-info disabled'); break;
-                default: array('','','');
-            }
-            
-            return '                 <h5>Ändere deine Stimme hier ab</h5>
-                                     <a class="btn '.$classes[0].' btn-default btnvote_yes"
-                                        style="width: 70px"                                     
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Pro</font></a>
-                                     <a class="btn '.$classes[1].' btn-default btnvote_no" 
-                                        style="width: 70px" 
-                                        href="#" 
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Contra</font></a>
-                                     <a class="btn '.$classes[2].' btn-default btnvote_off" 
-                                        style="width: 70px" 
-                                        href="#" 
-                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Enthaltung</font></a>
-                                        ';
-        } else {
-            return 'ye soon to come infos';
-        }                                            
-    }
-        
-    private function js(){        
-        return  '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin/js/vote.js').'"></script>';}
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\bars_user.css').'" rel="stylesheet">'.
-                '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\bulletin.css').'" rel="stylesheet">'.
-                '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\comment.css').'" rel="stylesheet">';} 
-
-        
-    
-    public function html(){
-        $poll_expired = \DBD\UVOTE_POLL_EXPIRED::Q1(array($this->poll_ID));
-        $user_vote = votes::getUserPollData($this->poll_ID);
-        
-        $vars = array();
-        $vars['choice_party'] = '';
-        $vars['voice_weight'] = $vars['bars_user'] = $vars['bars_bt'] = '';
-        $vars['bars_party'] = '';
-        $vars['icons_party'] = '';
-        $vars['vote_class'] = $this->vote_choice();
-        $vars['comments_pro'] = '';
-        $vars['comments_con'] = '';
-        $vars['js'] = $this->js();
-        $vars['css'] = $this->css();
-                
-        $vars['vote_buttons'] =   $this->vote_buttons($poll_expired,$user_vote);
-//        $vars['p_fields'] = $this->p_fields();
-        if($user_vote){
-            $vars['comments_pro'] = $this->get_pro_comments();
-            $vars['comments_con'] = $this->get_con_comments();
-            $vars['icons_party'] = $this->icons_party();
-            $vars['choice_party'] = $this->choice_party();
-            $vars['bars_party'] = $this->bars_party();
-            $vars['bars_user'] =  $this->bars_user();
-            $vars['bars_bt'] = $this->bars_bt();
-            $vars['voice_weight'] = $this->voice_weight();
-        }
-        
-        $vars['poll_ID'] =  $this->poll_ID; //put it here - so its filled in!
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
-        
-        $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID));       
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bulletin.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/icons_table_parties.tpl b/uVote/page/default_bulletin/icons_table_parties.tpl
deleted file mode 100644
index b082c99..0000000
--- a/uVote/page/default_bulletin/icons_table_parties.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h5>${urvote_party_table_desc}</h5>
-<div style="width: 500px;">   
-    <div style="float: left"><img src="${frontend_logos}icon_urn.png" width="30"/></div>
-    <div style="float: left"></div>
-    <div style="margin-left: 50px; float: left"><img src="${frontend_logos}icon_urn_pro.png" width="30"/></div>
-    <div style="margin-left: 15px; float: left"><img src="${frontend_logos}icon_urn_con.png" width="30"/></div>
-    <div style="margin-left: 15px; float: left"><img src="${frontend_logos}icon_urn_ent.png" width="30"/></div>
-</div>
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/table_bt.tpl b/uVote/page/default_bulletin/table_bt.tpl
deleted file mode 100644
index 5e75d86..0000000
--- a/uVote/page/default_bulletin/table_bt.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-Ergebnis Bundestag   
-    <div class="progress" style="height: 20px; width: 350px;">
-      <div class="bar bar-success" style="width: ${bt_pro}%;">${bt_pro}%</div>
-      <div class="bar bar-danger" style="width: ${bt_con}%;">${bt_con}%</div>
-      <div class="bar bar-info" style="width: ${bt_ent}%;"><p>${bt_ent}%</p></div>
-    </div>
diff --git a/uVote/page/default_bulletin/table_parties.tpl b/uVote/page/default_bulletin/table_parties.tpl
deleted file mode 100644
index 699e779..0000000
--- a/uVote/page/default_bulletin/table_parties.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        <div style="width: 50px; height: 20px; float: right; margin-right: 10px;">
-          <div class="badge badge-success" style="">${party_yes}%</div>
-          <div class="badge badge-danger" style="">${party_no}%</div>
-          <div class="badge badge-info" style="">${party_ent}%</div>
-        </div>
diff --git a/uVote/page/default_bulletin/vote_bt.tpl b/uVote/page/default_bulletin/vote_bt.tpl
deleted file mode 100644
index 05813f2..0000000
--- a/uVote/page/default_bulletin/vote_bt.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div style="width: 500px; float: left">   
-    <div style="float: left"><img src="${frontend_logos}icon_${party}.png" width="30"></div>
-    <div style="margin-left: 5px; width: 20px; float: left"class="badge ${choice_class}">${choice}</div>
-    <div style="margin-left: 5px; width: 20px; float: left"class="badge badge-success">${party_yes}%</div>
-    <div style="margin-left: 5px; width: 20px; float: left"class="badge badge-important">${party_no}%</div>
-    <div style="margin-left: 5px; width: 20px; float: left"class="badge badge-info">${party_ent}%</div>
-    <div style="margin-left: 5px; width: 20px; float: left"class="badge ">${party_off}%</div>
-</div>
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/voteweight.tpl b/uVote/page/default_bulletin/voteweight.tpl
deleted file mode 100644
index fc5d06f..0000000
--- a/uVote/page/default_bulletin/voteweight.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div style="margin-top: 20px;">
-    Dein aktuelles Stimmgewicht bei dieser Abstimmung: 
-    <span class="badge badge-info">${voteweight}%</span>
-</div>
\ No newline at end of file
diff --git a/uVote/page/default_comment/comment.tpl b/uVote/page/default_comment/comment.tpl
deleted file mode 100644
index 8f01cea..0000000
--- a/uVote/page/default_comment/comment.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div><font size="1">${timestamp}</font></div>
-<div>${c_txt}</div>
-<div><font size="2">${c_src}</font></div>
-<br>
\ No newline at end of file
diff --git a/uVote/page/default_comment/default_comment.php b/uVote/page/default_comment/default_comment.php
deleted file mode 100644
index 32b9b0c..0000000
--- a/uVote/page/default_comment/default_comment.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-class default_comment extends SYSTEM\PAGE\Page {
-    private $poll_ID = NULL;
-    
-    public function __construct($poll_ID) {
-        $this->poll_ID=$poll_ID;}
-    
-    public function vote_choice(){
-        $vars = votes::getUserPollData($this->poll_ID);
-        return $this->tablerow_class($vars);
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'con';
-            case 3:
-                return 'ent';
-            default:
-                return 'open';
-        }        
-    }
-    
-   
-    
-    private function get_pro_comments (){
-        $result = '';
-        $vars = votes::getUserComments($this->poll_ID, 1);
-        foreach($vars as $com){
-            $com['c_txt'] = utf8_encode($com['c_txt']);
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
-        }
-        return $result;
-    
-    }
-    private function get_con_comments (){
-        $result = '';
-        $vars = votes::getUserComments($this->poll_ID, 2);
-        
-        foreach($vars as $com){
-            $com['c_txt'] = utf8_encode($com['c_txt']);
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
-        }
-        return $result;
-    
-    }
-    
-    
-    
-    
-    
-        
-    private function js(){        
-        return  '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin/js/vote.js').'"></script>';}
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page\css\default_page.css').'" rel="stylesheet">';} 
-
-    public function html(){
-        $poll_expired = \DBD\UVOTE_POLL_EXPIRED::Q1(array($this->poll_ID));
-        $user_vote = votes::getUserPollData($this->poll_ID);
-        
-        $vars = array();
-        $vars['comments_pro'] = '';
-        $vars['comments_con'] = '';
-        $vars['js'] = $this->js();
-        $vars['css'] = $this->css();
-                
-        $vars['vote_buttons'] =   $this->vote_buttons($poll_expired,$user_vote);
-//        $vars['p_fields'] = $this->p_fields();
-        if($user_vote){
-            $vars['comments_pro'] = $this->get_pro_comments();
-            $vars['comments_con'] = $this->get_con_comments();
-        }
-        
-        $vars['poll_ID'] =  $this->poll_ID; //put it here - so its filled in!
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
-        
-        $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID));       
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_comment/comment.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/cover.tpl b/uVote/page/default_page/cover.tpl
deleted file mode 100644
index 1ff8efd..0000000
--- a/uVote/page/default_page/cover.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
-    <img src="${frontend_logos}cover.png"/>
-    <div id="cover_style">
-        <img src="${frontend_logos}chrome.png" width="200px"/>
-    </div>
-</div>
diff --git a/uVote/page/default_page/css/cover.css b/uVote/page/default_page/css/cover.css
deleted file mode 100644
index df0a719..0000000
--- a/uVote/page/default_page/css/cover.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.row {
-    margin-right: 30px;
-}
-#cover_style {
-    margin-right: 25px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/default_page.css b/uVote/page/default_page/css/default_page.css
deleted file mode 100644
index 84f72b3..0000000
--- a/uVote/page/default_page/css/default_page.css
+++ /dev/null
@@ -1,67 +0,0 @@
-body {
-  padding-top: 60px;
-  padding-bottom: 40px;
-}
-
-/*.list {
-    border: 2px solid #ccc;
-}*/
-
-.pro{
-    background: #5eb95e;
-}
-
-.con{
-    background: #ee5f5b;
-}
-
-.ent{
-    background: lightgrey;
-}
-
-.badge {
-  padding: 1px 9px 2px;
-  font-size: 12.025px;
-  font-weight: bold;
-  white-space: nowrap;
-  color: #ffffff;
-  background-color: #999999;
-  -webkit-border-radius: 9px;
-  -moz-border-radius: 9px;
-  border-radius: 9px;
-}
-.badge:hover {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.badge-error {
-  background-color: #b94a48;
-}
-.badge-error:hover {
-  background-color: #953b39;
-}
-.badge-warning {
-  background-color: #f89406;
-}
-.badge-warning:hover {
-  background-color: #c67605;
-}
-.badge-success {
-  background-color: #468847;
-}
-.badge-success:hover {
-  background-color: #356635;
-}
-.badge-info {
-  background-color: #3a87ad;
-}
-.badge-info:hover {
-  background-color: #2d6987;
-}
-.badge-inverse {
-  background-color: #333333;
-}
-.badge-inverse:hover {
-  background-color: #1a1a1a;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/full_vote.css b/uVote/page/default_page/css/full_vote.css
deleted file mode 100644
index 40a001f..0000000
--- a/uVote/page/default_page/css/full_vote.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.row {
-    margin: 0;
-}
-
-.span6 {
-    float: right
-}
-
-.span6#iframe_ {
-    width: 50%;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/loggedinform.css b/uVote/page/default_page/css/loggedinform.css
deleted file mode 100644
index 5da54ab..0000000
--- a/uVote/page/default_page/css/loggedinform.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.row#row_loggedinform {
-    padding-bottom: 20px;
-}
-
-.btn#btn_loggedinform {
-    margin-left: 150px; 
-    height: 100px; 
-    width: 100px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/loggedinformtop.css b/uVote/page/default_page/css/loggedinformtop.css
deleted file mode 100644
index e69de29..0000000
diff --git a/uVote/page/default_page/css/loginform.css b/uVote/page/default_page/css/loginform.css
deleted file mode 100644
index 63ce3ac..0000000
--- a/uVote/page/default_page/css/loginform.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#help-block {
-    float: right; 
-    padding: 0;
-}
-
-#controls {
-    float: right; 
-    margin-right: 10px;
-}
-
- #controls2 {
-     float: right;
-     margin-right: 20px;
- }
- 
-.btn btn-primary#login_submit {
-    float: right; 
-    height: 32px; 
-    font-size: 13px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/page.css b/uVote/page/default_page/css/page.css
deleted file mode 100644
index 198bc6d..0000000
--- a/uVote/page/default_page/css/page.css
+++ /dev/null
@@ -1,35 +0,0 @@
-body {
-    padding-top: 60px;
-}
-
-.main_container {
-}
-
-.modal {
-    float: left; 
-    display:none;
-}
-
-.navbar-inner { 
-    padding-left: 50px; 
-    padding-right: 50px;
-}
-
-#site-content {
-    padding: 0; 
-    margin: 0; 
-    margin-left: 35px;
-}
-            
-#user_main {
-    padding: 0; 
-    padding-top: 0px; 
-    width: 50%; 
-    float: left;
-}
-            
-#user_list { 
-    padding: 0px; 
-    width: 49%; 
-    float: right;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/parties_on_vote.css b/uVote/page/default_page/css/parties_on_vote.css
deleted file mode 100644
index e69de29..0000000
diff --git a/uVote/page/default_page/css/register_form.css b/uVote/page/default_page/css/register_form.css
deleted file mode 100644
index 5984d36..0000000
--- a/uVote/page/default_page/css/register_form.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.btn#btn_register_form {
-    margin-top: 0;
-}
-
-.control-group{
-    margin: 0px; 
-    padding: 0px;
-}
-
-#remember_me {
-    margin-top: -1px;
-}
-
-#help-block-user-password-combi-wrong {
-    display: none;
-    color: red;
-}
-
-.btn btn-primary#btn-primary_register_form {
-    clear: left; 
-    height: 32px; 
-    font-size: 13px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/css/vote.css b/uVote/page/default_page/css/vote.css
deleted file mode 100644
index a73fddb..0000000
--- a/uVote/page/default_page/css/vote.css
+++ /dev/null
@@ -1,69 +0,0 @@
-#vote_main {
-    margin-bottom: 5px; 
-    width: 100%; 
-    min-height: 125px; 
-    border: solid lightgray 1px; 
-    background: beige;
-}
-    
-#vote_sub1 {
-    float: left; 
-    width: 75%; 
-    padding: 5px; 
-    padding-top: 0;
-}
-
-#vote_sub2 {
-    margin: 0; 
-    padding: 0; 
-    float: right;
-}
-
-#vote_sub3 {
-    width: 100%; 
-    height: 125px; 
-    margin: 0; 
-    padding: 0;
-}
-
-#bt_vote_class_ {
-    float: left; 
-    width: 80px; 
-    border-left: 1px solid lightgray; 
-    padding-right: 2px; 
-    padding-left: 2px;
-}
-
- #uv_vote_class_ {
-     float: left; 
-     height: 125px; 
-     width: 60px; 
-     border-left: 1px solid lightgray; 
-     padding-right: 2px; 
-     padding-left: 2px;
- }
- 
-#time_done {
-     background: white; 
-     margin: 0; 
-     padding: 0;
-}
-
-#vote_sub_3_1 {
-    width: 5px; 
-    margin: 0; 
-    padding: 0;
-}
-
-#vote_sub_3_2 {
-    width: 5px; 
-    margin: 0; 
-    padding: 0;
-}
-
-#time_left { 
-    background: blue; 
-    margin: 0; 
-    padding: 0;
-}
-            
\ No newline at end of file
diff --git a/uVote/page/default_page/css/vote_bt.css b/uVote/page/default_page/css/vote_bt.css
deleted file mode 100644
index 7ef6333..0000000
--- a/uVote/page/default_page/css/vote_bt.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#vote_bt_span {
-    float:right;
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php
deleted file mode 100644
index 790cf83..0000000
--- a/uVote/page/default_page/default_page.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-class default_page extends SYSTEM\PAGE\Page {        
-    private function js(){        
-        return  '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jquery/jquery-1.9.1.min.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/js/bootstrap.min.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jqbootstrapvalidation/jqBootstrapValidation.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.md5.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.sha1.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jquery.countdown\jquery.countdown.js').'"></script>'.                
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.               
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/account_create.js').'"></script>'.
-                '<script src="https://www.google.com/jsapi" type="text/javascript"></script>'.
-                '<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>';
-    }
-    
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/page.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/full_vote.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/cover.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/vote.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/vote_bt.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/loggedinformtop.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/register_form.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/parties_on_vote.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/loggedinform.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/loginform.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-theme.min.css').'" rel="stylesheet">'.
-               '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';}        
-
-    private function get_party_per_poll($choice){
-        switch($choice){
-            case 1:
-                return 'PRO';
-            case 2:
-                return 'CON';
-            case 3:
-                return 'ENT';
-            default:
-                return 'NONE';
-        }           
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'con';
-            case 3:
-                return 'ent';
-            default:
-                return 'open';
-        }        
-    }
-    
-    private static function badge_class($choice){
-        switch($choice){
-            case 1:
-                return 'badge-success';
-            case 2:
-                return 'badge-important';
-            case 3:
-                return 'badge-info';
-            default:
-                return '';
-        }
-    }
-    
-    public static function panel_class($choice){
-        switch($choice){
-            case 1:
-                return 'panel-success';
-            case 2:
-                return 'panel-danger';
-            case 3:
-                return 'panel-info';
-            default:
-                return 'panel-default';
-        }
-    }
-    
-    public function generate_votelist(){        
-        $result = array('','');
-        $votes = votes::getAllVotesOfGroup(1);               
-        foreach($votes as $vote){
-            $time_remain = strtotime($vote['time_end'])-  microtime(true);
-            $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
-            $vote_count = votes::get_count_user_votes_per_poll($vote['ID']);
-            
-            $vote['title'] = utf8_encode($vote['title']);            
-            $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
-            $vote['time_done'] = 100-$vote['time_left'];
-            
-            $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen';            
-            $vote['uv'] = $vote['bt'] = '';            
-            $vote['uv_count'] = $vote_count['count'] > 4 ? $vote_count['count'] : '< 5';
-            
-            $user_vote = votes::getUserPollData($vote['ID']);
-            $vote['vote_class'] = $this->tablerow_class($user_vote);
-            if($user_vote){
-                //user vote
-                $vote['vote_class'] = $this->tablerow_class($user_vote);                
-
-                //bt vote
-                $party_votes = votes::get_barsperparty($vote['ID']);
-                $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']);
-                foreach($party_votes as $pv){
-                    $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_bt.tpl'),
-                                    array(  'party' => $pv['party'],
-                                            'choice' => $this->get_party_per_poll($pv['choice']),
-                                            'choice_class' => $this->badge_class($pv['choice'])));                    
-                }                        
-
-                //uvote vote
-                $uvote = votes::get_users_choice_per_poll($vote['ID']);                
-                $vote['uv_vote_class'] = count($uvote) > 0 ? $this->tablerow_class($uvote[0]['choice']) : '';                                
-                foreach($uvote as $v){
-                    $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'),
-                                    array(  'badge' => self::badge_class($v['choice']),
-                                            'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0));
-                }
-            }
-            
-            //new panels:
-            $vote['panel_class'] = self::panel_class($user_vote);
-            
-            if($time_remain > 0){               
-                $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            } else {
-                $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            }
-        }
-        return $result[0].$result[1];
-    }        
-
-    public function get_coverpage(){
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/cover.tpl'), array());}
-
-    public function getloggedinform(){
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/loggedinform.tpl'),array());} 
-    
-    public function exchange_registerform(){
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/register_form.tpl'),array());}
-    
-    public function getloginform(){
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/loginform.tpl'),array());} 
-    
-    public function exchange_loginform(){
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/loggedinformtop.tpl'),array());}
-
-    public function html(){
-        $vars = array();               
-        $vars['js'] = $this->js(); 
-        $vars['css'] = $this->css();
-        $vars['votelist'] = $this->generate_votelist();
-        $vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform();
-        $vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ;
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';        
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/page.tpl'), $vars);        
-    }
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/full_vote.tpl b/uVote/page/default_page/full_vote.tpl
deleted file mode 100644
index 47f533b..0000000
--- a/uVote/page/default_page/full_vote.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="row">
-    <div class="span6">       
-        Quelle: <a href="${iframe_link}">${iframe_link} </a>
-    </div>
-    <div class="span6" id="iframe_">          
-        <iframe src="${iframe_link}" width="730" height="4000"></iframe>
-    </div>
-</div>
-
diff --git a/uVote/page/default_page/js/account_create.js b/uVote/page/default_page/js/account_create.js
deleted file mode 100644
index 28f1e77..0000000
--- a/uVote/page/default_page/js/account_create.js
+++ /dev/null
@@ -1,6 +0,0 @@
-function getuserpersonaldata()
-{
-    var userInput = document.getElementById("userInput").value;
-    document.write(userInput);
-}
-
diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js
deleted file mode 100644
index 1c7bff4..0000000
--- a/uVote/page/default_page/js/loadtexts.js
+++ /dev/null
@@ -1,434 +0,0 @@
-$(document).ready(function() {    
-    load_user_main();
-    load_user_list();            
-    register_login();
-    register_logout();
-});
-
-function load_user_list(){
-    $('#user_list').load('./?action=user_list', function(){
-        register_user_list();});
-}
-function load_user_main(){
-    $('#user_main').load('./?action=user_main', function(){
-        register_user_main();
-    });
-}
-
-function register_user_list(){
-    $('#tabs_user_list a').click(function (e) {
-        e.preventDefault();
-        load_user_list_tab($(this).attr('action'));
-        $(this).tab('show');        
-    });
-    $('.btn_vote').click(function () {
-        //vote_click($(this).attr('poll_ID'));
-        $('#user_main').load('./?action=open_bulletin&poll_ID=' + $(this).attr('poll_ID'));                      
-        open_vote($(this).attr('poll_ID'));                     
-        register_registerform();
-    });      
-    $('.btn_fade').click(function () {           
-        $('#vote_data_panel' + $(this).attr('poll_ID')).toggle();
-    });
-}
-function register_user_main(){
-    register_registerform();
-    $('#feedback_submit').click(function (data){
-        var test = $('textarea#feedback_text').val();
-        send_feedback(test);            
-    });
-    $('#tabs_user_main a').click(function (e) {
-        e.preventDefault();
-        load_user_main_tab($(this).attr('action'));
-        $(this).tab('show');                
-    });
-}
-
-function register_login(){
-    $("#form_login input").not("[type=submit]").jqBootstrapValidation({        
-        //load_user_main_tab('user_main_uVote');
-    });    
-    
-    $('#user_list').load('./?action=user_list', function(){
-        $('#tabs_user_list a').click(function (e) {
-            e.preventDefault();
-            $(this).tab('show');
-            load_user_list_tab($(this).attr('action'));
-            
-        });
-        $('.btn_vote').click(function () {
-            //vote_click($(this).attr('poll_ID'));
-            $('#user_main').load('./?action=open_bulletin&poll_ID=' + $(this).attr('poll_ID'));                      
-                open_vote($(this).attr('poll_ID'));                     
-                register_registerform();
-            });      
-        $('.btn_fade').click(function () {           
-            $('#vote_data_panel' + $(this).attr('poll_ID')).show();
-            });
-
-        //load_user_main_tab('user_main_uVote');
-    });    
- $("#form_login input").not("[type=submit]").jqBootstrapValidation({
-        
-        preventSubmit: true,
-        submitError: function($form, event, errors) {},
-        submitSuccess: function($form, event){
-            $.get('./api.php?call=account&action=login&username=' + $('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) {
-                if(data == 1){
-                    window.location.reload();                    
-                } else {
-                    $('#help-block-user-password-combi-wrong').attr('style', 'display: block;');
-                }                    
-            });
-            event.preventDefault();
-        }
-    });
-}
-function register_logout(){
-    $('#btn_logout').click(function(){
-        $.get('./api.php?call=account&action=logout', function () {                      
-            window.location.reload();                                  
-        });
-    })
-    /*$("#form_logout input").not("[type=submit]").jqBootstrapValidation(
-    {
-        preventSubmit: true,            
-        submitError: function($form, event, errors) {},
-        submitSuccess: function($form, event){
-            $.get('./api.php?call=account&action=logout', function (data) {                      
-                window.location.reload();                                  
-            });
-            event.preventDefault();
-        }            
-    });*/
-    
-    
-}
-
-function register_registerform(){
-    //console.log("wegwegwegwegwegweg");
-    $("#register_user_form input").not("[type=submit]").jqBootstrapValidation(
-    {
-        preventSubmit: true,            
-        submitError: function($form, event, errors) {},
-        submitSuccess: function($form, event){
-            $.get('./api.php?call=account&action=create&username=' + $('#register_username').val() + '&password_sha=' + $.sha1($('#user_register_password1').val()) + '&email=' + $('#register_email').val() + '&locale=deDE', function (data) {
-                if(data == 1){
-                    window.location.reload();
-                } else {
-                    $('#help-block-user-password-combi-wrong').attr('style', 'display: block;');
-                }                    
-            });
-            event.preventDefault();
-        }
-    });
-}
-
-function load_user_main_tab(action){    
-    switch(action){        
-        case 'user_main_uVote':
-            //$('#tab_uVote').load('./?action='+ action);        //causes error
-            return;
-        case 'user_main_urVote':
-            $('#tab_urVote').load('./?action='+ action);
-            return;
-        case 'user_main_myVote':
-            $('#tab_myVote').load('./?action='+ action, function(){
-                $('.add_data_submit').click(function () {
-                    submit_add_data();
-                    alert('success');
-                });
-            });
-            return;
-        default:
-    }   
-}
-function load_user_list_tab(action){    
-    switch(action){        
-        case 'user_list_active':
-            $('#tab_active').load('./?action='+ action, function(){
-                $('.btn_fade').click(function () {           
-                    $('#vote_data_panel' + $(this).attr('poll_ID')).show();
-                });
-                $('.btn_vote').click(function () {
-                //vote_click($(this).attr('poll_ID'));
-                $('#user_main').load('./?action=open_bulletin&poll_ID=' + $(this).attr('poll_ID'));
-                    open_vote($(this).attr('poll_ID'));                     
-                    register_registerform();
-                
-                })});      
-            return;
-        case 'user_list_ended':
-            $('#tab_ended').load('./?action='+ action, function(){
-                $('.btn_fade').click(function () {           
-                    $('#vote_data_panel' + $(this).attr('poll_ID')).show();
-                });
-                $('.btn_vote').click(function () {
-                //vote_click($(this).attr('poll_ID'));
-                $('#user_main').load('./?action=open_bulletin&poll_ID=' + $(this).attr('poll_ID'));
-                    open_vote($(this).attr('poll_ID'));                     
-                    register_registerform();
-                })});      
-            return;
-            default:
-    }
-}
-
-function account_create(inputEmail, inputPassword){
-    $.get('./api.php?call=account&action=create&username=' + NULL + '&password_sha=' + password + '&email=' + email + '&locale=deDE', function (data) {
-            dataTmp = data;               
-    }).complete(function() {      
-
-    }); 
-}
-
-function load_openvoteinfo (poll_ID){
-       var openvoteinfo;
-       $.get('./index.php?action=openinfo&poll_ID=' + poll_ID, function (data) {
-                openvoteinfo = data;
-                bodyelem = $("");
-                bodyelem.animate();                
-	}).complete(function() {      
-            $('#openvoteinfo'+poll_ID).slideUp({duration: 'slow',
-            complete: function(){ 
-                $('#openvoteinfo'+poll_ID).html(openvoteinfo);
-                $('#openvoteinfo'+poll_ID).slideDown('slow');
-                site_content_is_visible = true;
-            }});
-        });  
-
-}
-
-function get_barsperparty (poll_ID) {
-    $.get('./api.php?call_bars_action_getbarsperparty&poll_ID=' + poll_ID, function (data) {
-    dataTmp = data;               
-    }).complete(function() {      
-
-    }); 
-}
-
-function vote_click (poll_ID, vote) {
-    $.getJSON('./api.php?call=vote&action=vote&poll_ID=' + poll_ID + '&vote=' + vote, function(data) {
-        var items = [];   
-        if(data.status == true){
-            alert("success");
-            $('#user_main').load('./?action=open_bulletin&poll_ID=' + poll_ID, function(){
-                open_vote(poll_ID);                
-            });                   
-        } else {
-            alert(data.result.message);
-        }
-    }); 
-}
-
-function submit_commentrate (c_ID, val) {
-    alert('success');
-    $.getJSON('./api.php?call=vote&action=commentrate&c_ID=' + c_ID + '&val=' + val, function(data) {         
-        var items = [];   
-        if(data.status == true){                  
-        } else {
-            alert(data.result.message);
-        }
-    }); 
-}
-
-function encode_utf8(c) {
-  return unescape(encodeURIComponent(c));
-}
-
-function decode_utf8(c) {
-  return decodeURIComponent(escape(c));
-}
-
-function submit_c_data (poll_ID) {
-    var c = $("#c_txt_pro").val();
-    var c_src = $("#c_src_pro").val();
-    var a = document.getElementById("side_select");
-    var c_choice = a.options[a.selectedIndex].value;
-    $.getJSON('./api.php?call=vote&action=comment&poll_ID=' + poll_ID + '&c_choice=' + c_choice + '&c_txt=' + c_txt + '&c_src=' + c_src, function(data) {
-        var items = [];   
-        if(data.status == true){
-            alert("success");
-            $('#user_main').load('./?action=open_bulletin&poll_ID=' + poll_ID, function(){
-                open_vote(poll_ID);                
-            });                   
-        } else {
-            alert(data.result.message);
-        }
-    }); 
-}
-
-function submit_add_data () {
-    var a = document.getElementById("location");
-    var location = a.options[a.selectedIndex].text;
-    var b = document.getElementById("birthyear");
-    var birthyear = b.options[b.selectedIndex].text;
-    var c = document.getElementById("gender");
-    var gender = c.options[c.selectedIndex].text;
-    var d = document.getElementById("children");
-    var children = d.options[d.selectedIndex].text;
-    $.getJSON('./api.php?call=vote&action=data&location=' + location + '&birthyear=' + birthyear + '&gender=' + gender + '&children=' + children, function(data) {
-
-        var items = [];   
-        if(data.status == true){
-            alert("success");                   
-        } else {
-            alert(data.result.message);
-        }
-    }); 
-}
-
-function send_feedback (feedback) {
-    var val = JSON.stringify(feedback);
-    console.log("feedback called");
-    $.ajax({
-        url: 'http://mojotrollz.eu/web/uVote/api.php',
-       // contentType : "application/json; charset=utf-8",
-        data : {
-            'call': 'vote',
-            'action': 'feedback',
-            'feedback': val
-        },
-        type : 'POST',
-        dataType: 'json',
-        async: false,
-        success: function() {
-            alert("success");
-        },
-        error: function(error){
-            alert("something failed..."+error);
-        }
-    });
-}
-
-function open_vote (poll_ID) {
-    $('#user_list').load('./api.php?call=vote&action=open_vote&poll_ID=' + poll_ID, function(){
-        $('.btnvote_yes').click(function () {            
-            vote_click($(this).attr('poll_ID'),1);
-            });
-        $('.btnvote_no').click(function () {
-            vote_click($(this).attr('poll_ID'),2);
-            });
-        $('.btnvote_off').click(function () {
-            vote_click($(this).attr('poll_ID'),3);
-            });
-        $('.submit_pro').click(function () {
-            submit_c_data($(this).attr('poll_ID'));
-            alert('success');
-            });
-        $('.c_up').click(function () {
-                   submit_commentrate($(this).attr('c_ID'), 1);
-                });
-        $('.c_down').click(function () {
-                   submit_commentrate($(this).attr('c_ID'), 2);
-                });
-        $('.c_spam').click(function () {
-                   submit_commentrate($(this).attr('c_ID'), 3);
-                });
-        $('#test').click(function(){
-            $('#myModal').modal();
-        });
-        
-        register_registerform();        
-    }); 
-}
-
-function loadAjaxContent(url) {
-        var dataTmp;
-	$.get(url, function (data) {
-                dataTmp = data;
-                bodyelem = $("html,body");
-                bodyelem.animate();
-	}).complete(function() {      
-            $('#site-content-wrapper').slideUp({duration: 'slow',
-            complete: function(){ 
-                $('#site-content').html(dataTmp);
-                $('#site-content-wrapper').slideDown('slow');
-                site_content_is_visible = true;
-            }});
-        }); 
-}
-function loadUrlPic(url_pic) {
-    var dataTmp;
-    $.get(url_pic, function (data) {
-        dataTmp = data;
-        bodyelem = $("html,body");
-        bodyelem.animate();
-    }).complete(function() {
-            $('.carousel-inner').slideUp({duration: 'slow',
-            complete: function(){
-                $('#pic').html(dataTmp);
-                $('.carousel-inner').slideDown('slow');
-                site_content_is_visible = true;
-            }});
-        }); 
-}
-
-function loadApiPic(id) {
-    var dataTmp;
-    $.get('./api.php?call=img&id='+id, function (data) {
-        dataTmp = data;
-        bodyelem = $("html,body");
-        bodyelem.animate();
-    }).complete(function() { 
-        
-    });
-}
-
-function load_visualisation(id, timespan){
-    $('img#loader').show();    
-    $.getJSON('./api.php?call=graph_bt_to_uvote_overall_by_time',function(json){
-        if(!json || json.status != true || !json.result){
-            $('img#loader').hide();            
-            return;
-        }        
-        json = json.result;
-        $('img#loader').hide();
-        var data = new google.visualization.DataTable();
-        first = true;        
-        $.each(json[0], function(key, value){
-            if(first){                
-                data.addColumn('datetime',key);
-                first = false;
-            } else {
-                data.addColumn('number',key);
-            }       
-        });            
-        $.each(json, function(key, value){
-            first = true;
-            data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [parseFloat(v)];}}));});
-         
-        console.log(data);
-        var options = {title: 'Übereinstimmung uVote Community/Bundestag', aggregationTarget: 'category', selectionMode: 'multiple', /*curveType: 'function',*/ /*focusTarget: 'category',*/ chartArea:{},  vAxis:{format:'#%', logScale: false}, interpolateNulls: false,  width: "300", height: "250"};
-        //LineChart
-        new google.visualization.ColumnChart(document.getElementById(id)).draw(data, options);
-    });
-}
-function load_visualisation_urvote(id, timespan){
-    $('img#loader').show();    
-    $.getJSON('./api.php?call=graph_bt_to_user_overall_by_time',function(json){
-        if(!json || json.status != true || !json.result){
-            $('img#loader').hide();            
-            return;
-        }        
-        json = json.result;
-        $('img#loader').hide();
-        var data = new google.visualization.DataTable();
-        first = true;        
-        $.each(json[0], function(key, value){
-            if(first){                
-                data.addColumn('datetime',key);
-                first = false;
-            } else {
-                data.addColumn('number',key);
-            }       
-        });            
-        $.each(json, function(key, value){
-            first = true;
-            data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [parseFloat(v)];}}));});
-         
-        console.log(data);
-        var options = {title: id, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{},  vAxis:{logScale: false}, interpolateNulls: false,  width: "300", height: "250"};
-        new google.visualization.LineChart(document.getElementById(id)).draw(data, options);
-    });
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/loggedinform.tpl b/uVote/page/default_page/loggedinform.tpl
deleted file mode 100644
index 7b259ae..0000000
--- a/uVote/page/default_page/loggedinform.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<div>
-    
-<form class="form-horizontal">
-
-uVote kann die Repräsentativität der Daten
-<br>
-nur durch die freiwillige Angabe von
-<br>
-persöhnlichen Daten gewährleisten.
-<br>
-Zum Umgang mit diesen Daten lesen sie bitte
-<br>
-unsere AGBs.
-        <br>
-        <div class="row" id="row_loggedinform" style="padding-bottom: 20px;">
-        <div class="span">       
-<li class="dropdown">
-                      <a href="#" role="button" class="btn" data-toggle="dropdown">Alter <b class="caret"></b></a>
-                      <ul class="dropdown-menu" style="width: 20px;" aria-labelledby="drop1" >
-                        <li role="presentation"><a  href="" >(<18)  Jahre</a></li>
-                        <li role="presentation" class="divider"></li>
-                        <li role="presentation"><a  href="">(18-25) Jahre</a></li>
-                        <li role="presentation"><a  href="">(26-35) Jahre</a></li>
-                        <li role="presentation"><a  href="">(35-45) Jahre</a></li>
-                        <li role="presentation"><a  href="">(46-55) Jahre</a></li>
-                        <li role="presentation"><a  href="">(56-65) Jahre</a></li>
-                        <li role="presentation"><a  href="">(66-75) Jahre</a></li>
-                        <li role="presentation" class="divider"></li>
-                        <li role="presentation"><a  href="">(>75)   Jahre</a></li>
-                      </ul>
-                    </li>
-                    
- <li class="dropdown">
-                      <a href="#" role="button" class="btn" data-toggle="dropdown">Beruf/Ausbildung <b class="caret"></b></a>
-                      <ul class="dropdown-menu" style="width: 20px;" aria-labelledby="drop1" >
-                        <li role="presentation"><a  href="" >Schüler</a></li>
-                        <li role="presentation"><a  href="">Azubi</a></li>
-                        <li role="presentation"><a  href="">Student</a></li>
-                        <li role="presentation" class="divider"></li>
-                        <li role="presentation"><a  href="">Angestellt</a></li>
-                        <li role="presentation"><a  href="">Selbstständig</a></li>
-                        <li role="presentation"><a  href="">Rentner</a></li>
-                        <li role="presentation"><a  href="">Arbeitslos</a></li>
-                        <li role="presentation" class="divider"></li>
-                        <li role="presentation"><a  href="">Sonstiges</a></li>
-                      </ul>
-                    </li>                   
-<li class="dropdown">
-                      <a href="#" role="button" class="btn" data-toggle="dropdown">Geschlecht <b class="caret"></b></a>
-                      <ul class="dropdown-menu" style="width: 20px;" aria-labelledby="drop1" >
-                        <li role="presentation"><a  href="" >männlich</a></li>
-                        <li role="presentation" class="divider"></li>
-                        <li role="presentation"><a  href="">weiblich</a></li>
-                        
-                      </ul>
-                    </li>
-        </div>
-        <div class="span">
-<button type="submit" align="right" class="btn" id="btn_loggedinform">Daten absenden</button>
-        </div>
-        </div>
-      
-</form>
-   
-</div>
- 
\ No newline at end of file
diff --git a/uVote/page/default_page/loggedinformtop.tpl b/uVote/page/default_page/loggedinformtop.tpl
deleted file mode 100644
index 130cffc..0000000
--- a/uVote/page/default_page/loggedinformtop.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<form class="navbar-form navbar-right" id="form_logout">
-    <button id="btn_logout" type="submit" class="btn btn-primary">Logout</button>              
-</form>
\ No newline at end of file
diff --git a/uVote/page/default_page/loginform.tpl b/uVote/page/default_page/loginform.tpl
deleted file mode 100644
index eb944b8..0000000
--- a/uVote/page/default_page/loginform.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--<form class="navbar-form pull-right" id="form_login">
-              <input class="span2" type="text" id="login_email" placeholder="E-Mail">
-              <input class="span2" type="password" id="login_password" placeholder="Passwort">
-              <button type="submit" class="btn">Login</button>
-</form> -->
-<form class="navbar-form navbar-right" id="form_login">
-    <!--<div class="control-group">
-        <div id="help-block"></div>
-        <input type="hidden" />
-        <div id="controls">
-            <input  type="text"
-                    size="20"
-                    style=""
-                    id="bt_login_user"
-                    placeholder="${user_name_login}"
-                    minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
-                    maxlength="16" data-validation-maxlength-message="${register_user_name_too_long}"
-                    required data-validation-required-message="${register_user_name_required}"/>
-        </div>
-        <div id="controls2" style="float: right;margin-right: 20px;">
-            <input  type="password"
-                    size="20"
-                    style=""
-                    id="bt_login_password"
-                    placeholder="${user_password_login}"
-                    minlength="5" data-validation-minlength-message="${register_password_too_short}"
-                    maxlength="16" data-validation-maxlength-message="${register_user_password_too_long}"
-                    required data-validation-required-message="${register_user_password_required}"/>
-        </div>
-    </div>
-    -->
-     <div class="form-group">
-          <div id="help-block"></div>
-          <input  type="text"
-                    size="20"
-                    style=""
-                    id="bt_login_user"
-                    placeholder="${user_name_login}"
-                    minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
-                    maxlength="16" data-validation-maxlength-message="${register_user_name_too_long}"
-                    required data-validation-required-message="${register_user_name_required}"/>
-          <input  type="password"
-                    size="20"
-                    style=""
-                    id="bt_login_password"
-                    placeholder="${user_password_login}"
-                    minlength="5" data-validation-minlength-message="${register_password_too_short}"
-                    maxlength="16" data-validation-maxlength-message="${register_user_password_too_long}"
-                    required data-validation-required-message="${register_user_password_required}"/>
-    </div>
-    <button class="btn btn-primary" type="submit" id="login_submit">${login}</button>
-</form>
\ No newline at end of file
diff --git a/uVote/page/default_page/page.tpl b/uVote/page/default_page/page.tpl
deleted file mode 100644
index 11c268f..0000000
--- a/uVote/page/default_page/page.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>    
-        <title>uVote</title>        
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">    
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="">
-        <meta name="author" content="">               
-        ${css}
-        ${js}
-    </head>
-    <body>
-    <div class="main_container">
-        <div class="modal fade" id="impressum">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title">Impressum</h4>
-                    </div>
-                    <div class="modal-body">
-                        <div style="background: white;">
-                            ${impressum_header}
-                            ${impressum_1}
-                            ${impressum_2}
-                            ${impressum_3}
-                            ${impressum_4}
-                            ${impressum_5}
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-            </div><!-- /.modal-content -->
-          </div><!-- /.modal-dialog -->
-        </div><!-- /.modal -->
-
-            <nav class="navbar navbar-default navbar-inverse navbar-fixed-top">
-                <div class="container-fluid">
-                    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                        <ul class="nav navbar-nav">
-                            <li><a class="brand" href="" id="menu_uvote">uVote</a></li>
-                            <li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>                            
-                        </ul>
-                        ${loginform}
-                    </div>
-                    <!--<div class="navbar-inner">-->
-                          <!--  <ul class="nav navbar-nav">              
-                                <li><a class="brand" href="" id="menu_uvote">uVote</a></li>
-                                <li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>
-                                
-                            </ul>                    -->
-                    <!--</div>                -->
-                </div>
-            </nav>
-
-            <div id="site-content">
-
-                <div id="user_main"></div>
-                
-                <div id="user_list"></div>
-                
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/uVote/page/default_page/parties_on_vote.tpl b/uVote/page/default_page/parties_on_vote.tpl
deleted file mode 100644
index 1762160..0000000
--- a/uVote/page/default_page/parties_on_vote.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="${bt_vote_class}" style="width: 80px; margin-top: 10px; border-left: 1px solid lightgray;">            
-            <img src="${frontend_logos}icon_${party}.png" width="30"><span class="badge badge-success" style="float:right;">${choice}</span><br>
-
-        </div>
\ No newline at end of file
diff --git a/uVote/page/default_page/pics/logo2.png b/uVote/page/default_page/pics/logo2.png
deleted file mode 100644
index e2e514e..0000000
Binary files a/uVote/page/default_page/pics/logo2.png and /dev/null differ
diff --git a/uVote/page/default_page/register_form.tpl b/uVote/page/default_page/register_form.tpl
deleted file mode 100644
index c9823de..0000000
--- a/uVote/page/default_page/register_form.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div>
-    <a class="btn" id="btn_register_form" align="left"></a>
-
-      <div class="control-group" id="control-group_register_form">
-        <div class="controls">
-            <input  type="text"
-                    size="30"
-                    id="bt_login_user"
-                    placeholder="${loginUsername}"
-                    data-validation-email-message="${check_mail_format}"
-                    required data-validation-required-message="${email_required}"/>
-        </div>
-
-        <div class="controls">
-            <input  type="password"
-                    name="login_password"
-                    size="30"
-                    id="bt_login_password"
-                    placeholder="${loginPassword}"
-                    minlength="5" data-validation-minlength-message="${login_password_too_short}"
-                    required data-validation-required-message="${login_password_required}"/>
-        </div>
-      </div>
-        <div class="control-group" id="control-group_register_form2">
-        <div class="controls">
-            <input  type="password"
-                    size="30"
-                    id="bt_login_password2"
-                    placeholder="${loginPassword}"
-                    data-validation-matches-match="login_password"
-                    data-validation-matches-message="${register_password_dont_math}"/>
-
-        </div>
-        <label><input type="checkbox" id="remember_me">  ${login_rememberMe}</label>
-        <div class="help-block"></div>
-        <div id="help-block-user-password-combi-wrong">${login_not_successfull}</div>
-        
-        <button class="btn btn-primary" id="btn-primary_register_form" type="submit" id="login_submit">${login}</button>
-                <input type="hidden" />
-    </div>
-
-    
-</div>
-
-
-
-    
-    
\ No newline at end of file
diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl
deleted file mode 100644
index c071dee..0000000
--- a/uVote/page/default_page/vote.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-<div id="vote_main">
-    <div id="vote_sub1">       
-        <h5>${title}</h5>           
-        <img src="${frontend_logos}icon_urn_${vote_class}.png">               
-        <a class="btn btn-primary btn-small btn_vote" poll_ID="${ID}">${full_vote_btn}</a>
-        <a class="btn btn-primary btn-small btn_fade" poll_ID="${ID}">${fade}</a>              
-    </div>
-    
-    <div id="vote_data_panel${ID}" poll_ID="${ID}" style="display: none; float: left;">
-        <div class="${bt_vote_class}" id="bt_vote_class_">            
-            <img src="${frontend_logos}icon_bt.png" width="80">
-            ${bt}            
-        </div>
-        <div class="${uv_vote_class}" id="uv_vote_class_">          
-            <img src="${frontend_logos}icon_urn.png" width="20">
-            <span style="">
-                <font size="2">uVote</font>
-            </span>
-            ${uv}
-            <span class="badge" style="">
-                ${uv_count}
-            </span>
-        </div>          
-    </div>
-        <div id="vote_sub2">
-        <div id="vote_sub3" class="poll_time" time="${time_end}">
-            <div id="time_done" style="height: ${time_done}%;">
-                <div id="vote_sub_3_1">
-                </div>
-            </div>
-            <div id="time_left" style="height: ${time_left}%;">
-                <div id="vote_sub_3_2">
-                </div>
-            </div>
-        </div>
-        </div>
-</div>
-
-<!--
-<div class="panel ${panel_class}">
-    <div class="panel-heading">
-        <h4 class="panel-title"><a data-toggle="collapse" data-parent="#accordion" href="#collapse_${ID}">${title}</a></h4>
-        bis einschließlich ${time_end}; ${time_left}% verblieben
-    </div>
-    <div id="collapse_${ID}" class="panel-collapse collapse">      
-        <div class="panel-body">
-            <img src="${frontend_logos}icon_urn_${vote_class}.png">
-            <a class="btn btn-primary btn-small btn_vote" poll_ID="${ID}">${full_vote_btn}</a>            
-            <div id="vote_data_panel${ID}" poll_ID="${ID}" style="float: right;">
-                <div class="${bt_vote_class}" id="bt_vote_class_">            
-                    <img src="${frontend_logos}icon_bt.png" width="80">
-                    ${bt}            
-                </div>
-                <div class="${uv_vote_class}" id="uv_vote_class_">          
-                    <img src="${frontend_logos}icon_urn.png" width="20">
-                    <span style="">
-                        <font size="2">uVote</font>
-                    </span>
-                    ${uv}
-                    <span class="badge" style="">
-                        ${uv_count}
-                    </span>
-                </div>          
-            </div>
-        </div>
-    </div>
-</div>-->
\ No newline at end of file
diff --git a/uVote/page/default_page/vote_bt.tpl b/uVote/page/default_page/vote_bt.tpl
deleted file mode 100644
index db443f1..0000000
--- a/uVote/page/default_page/vote_bt.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<img src="${frontend_logos}icon_${party}.png" width="30">
-<span id="vote_bt_span" class="badge ${choice_class}">${choice}</span><br>
\ No newline at end of file
diff --git a/uVote/page/default_page/vote_uv.tpl b/uVote/page/default_page/vote_uv.tpl
deleted file mode 100644
index 1fdff47..0000000
--- a/uVote/page/default_page/vote_uv.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="badge ${badge}">${perc}%</span>
diff --git a/uVote/page/default_register/css/register.css b/uVote/page/default_register/css/register.css
deleted file mode 100644
index 254e010..0000000
--- a/uVote/page/default_register/css/register.css
+++ /dev/null
@@ -1,56 +0,0 @@
-.panel-group#accordion {
-    padding-right: 30px;
-}
-
-#carousel-example-generic {
-    width: 50%; float: left;
-}
-
-#graph_bt_uv_overall {
-    float: left; 
-    width: 300px;
-}
-
-#register_username {
-    margin-bottom: 15px; 
-    float: left;
-}
-
-#register-help-block-username {
-    float: left; 
-    margin-top: 3px;
-}
-
-#register_email {
-    margin-bottom: 15px; 
-    float: left;
-}
-
-#register-help-block-email {
-    float: left; 
-    margin-top: 3px;
-}
-
-#change_user_password_sub {
-    clear: both;
-}
-
-#user_register_password1 {
-    margin-bottom: 15px; 
-    float: left;
-}
-
-#user_register_password2 {
-    margin-bottom: 15px; 
-    float: left;
-}
-
-#help-block_register {
-    float: left; 
-    margin-top: 3px;
-}
-
-#help-block_register2 {
-    float: left; 
-    margin-top: 3px;
-}
\ No newline at end of file
diff --git a/uVote/page/default_register/default_register.php b/uVote/page/default_register/default_register.php
deleted file mode 100644
index 86e160b..0000000
--- a/uVote/page/default_register/default_register.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class default_register extends SYSTEM\PAGE\Page {
-      
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_register/css/register.css').'" rel="stylesheet">';}
-
-     public function html(){
-        $vars = array();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars['css'] = $this->css();
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/register.tpl'), $vars);
-        
-    }
-}
\ No newline at end of file
diff --git a/uVote/page/default_register/register.tpl b/uVote/page/default_register/register.tpl
deleted file mode 100644
index d5d4172..0000000
--- a/uVote/page/default_register/register.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-    <div class="panel-group" id="accordion">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    Welcome
-                </h4>
-            </div>                        
-            <div class="panel-body">
-                <img src="${frontend_logos}logo2.png" width="450"/>
-                <img src="${frontend_logos}cover.png" width="450"/>
-                </br></br>
-                ${welcome_text}
-            </div>            
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_gallery">Gallery</a>
-                </h4>
-            </div>
-            <div id="collapse_gallery" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
-                        <!-- Indicators -->
-                        <ol class="carousel-indicators">
-                          <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
-                          <li data-target="#carousel-example-generic" data-slide-to="1"></li>
-                          <li data-target="#carousel-example-generic" data-slide-to="2"></li>
-                        </ol>
-                        <!-- Wrapper for slides -->
-                        <div class="carousel-inner">
-                          <div class="item active">
-                            <img src="..." alt="...">
-                            <div class="carousel-caption">
-                              ...
-                            </div>
-                          </div>
-                          ...
-                        </div>
-
-                        <!-- Controls -->
-                        <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
-                          <span class="glyphicon glyphicon-chevron-left"></span>
-                        </a>
-                        <a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
-                          <span class="glyphicon glyphicon-chevron-right"></span>
-                        </a>
-                    </div>
-                    <div id="graph_bt_uv_overall"></div>
-                    <script type="text/javascript" language="JavaScript">load_visualisation('graph_bt_uv_overall',84600);</script>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_register">Registrieren</a>
-                </h4>
-            </div>
-            <div id="collapse_register" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <form class="textbox" id="register_user_form">
-                        <div class="control-group" id="register_username_control_group">
-                            <table id="userRegisterTable" class="table table-striped">
-                               <tbody>
-                                    <tr>
-                                       <th style="width: 200px;">${user_name_register}</th>
-                                       <td>
-                                           <div class="control-group controls">
-                                                <input  type="text"
-                                                        size="30"
-                                                        id="register_username"
-                                                        placeholder="${ari_name}"
-                                                        minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
-                                                        required data-validation-required-message="${register_user_name_required}"/>
-                                                <br/>
-                                                <div id="register-help-block-username" class="help-block"></div>
-                                            </div>
-                                       </td>
-                                    </tr>
-                                    <tr>
-                                       <th>${user_email_register}</th>
-                                       <td>
-                                            <div class="control-group controls">
-                                                <input  type="email"
-                                                        size="30"
-                                                        id="register_email"
-                                                        placeholder="${ari_mail}"
-                                                        data-validation-email-message="${mail_format_wrong}"
-                                                        required data-validation-required-message="${register_email_required}"/>
-                                                <br/>
-                                                <div id="register-help-block-email" class="help-block"></div>
-                                            </div>
-                                       </td>
-                                    </tr>
-                                    <tr>
-                                       <th>${user_password_register}</th>
-                                       <td>
-                                            <div class="control-group" id="change_user_password">
-                                                  <div class="control-group controls" id="change_user_password_sub">
-                                                      <input  type="password"
-                                                              size="30"
-                                                              id="user_register_password1"
-                                                              name="user_register_password1"
-                                                              placeholder="${ari_pass}"
-                                                              minlength="5" data-validation-minlength-message="${register_password_too_short}"
-                                                              required data-validation-required-message="${register_password_required}"/>
-                                                      <br/>
-                                                      <div class="help-block" id="help-block_register"></div>
-                                                  </div>
-                                                  <div class="control-group controls" style="clear: both">
-                                                      <input  type="password"
-                                                              size="30"
-                                                              id="user_register_password2"
-                                                              name="user_register_password2"
-                                                              placeholder="${ari_pass}"
-                                                              data-validation-matches-match="user_register_password1"
-                                                              data-validation-matches-message="${register_password_dont_match}"/>
-                                                      <br/>
-                                                      <div class="help-block" id="help-block_register2"></div>
-                                                  </div>
-                                             </div>
-                                       </td>
-                                    </tr>
-                                    <tr>
-                                       <th>${locale}</th>
-                                       <td>
-                                           <div id="change_user_locale">
-                                               <select size="1" id="register_locale_select">
-                                                    <option value="deDE">deDE</option>
-                                                    <option value="enUS">enUS</option>
-                                                </select>
-                                           </div>
-                                       </td>
-                                    </tr>
-                               </tbody>
-                            </table>
-                            <button class="btn btn-primary" type="submit"><i class="icon-ok icon-white"></i> ${register}</button>
-                        </div>
-                </form>
-                </div>
-            </div>
-        </div>
-    </div>
\ No newline at end of file
diff --git a/uVote/page/page_uvote.php b/uVote/page/page_uvote.php
deleted file mode 100644
index 64c1c89..0000000
--- a/uVote/page/page_uvote.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-class page_uvote extends \SYSTEM\API\api_default {
-
-    public static function default_page(){
-        return new default_page();}        
-        
-    public static function action_open_bulletin ($poll_ID){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            return new default_register ();}
-        return new default_bulletin($poll_ID);}
-        
-    public static function action_user_main(){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            return new default_register ();}
-        return new user_main();}
-        
-    public static function action_user_list(){
-        return new user_list();}
-    
-    public static function action_user_list_active(){
-        return new user_list_active();}
-    
-    public static function action_user_list_ended(){
-        return new user_list_ended();}
-    
-    public static function action_user_main_urVote(){
-        return new user_main_urVote();}
-        
-    public static function action_user_main_myVote(){
-        return new user_main_myVote();}                         
-}
\ No newline at end of file
diff --git a/uVote/page/register_page_classes.php b/uVote/page/register_page_classes.php
deleted file mode 100644
index 56dba6a..0000000
--- a/uVote/page/register_page_classes.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_bulletin','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_comment','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_uVote','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_urVote','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_myVote','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_list','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_list_active','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_list_ended','');
diff --git a/uVote/page/user_list/css/list_menu.css b/uVote/page/user_list/css/list_menu.css
deleted file mode 100644
index 40f7469..0000000
--- a/uVote/page/user_list/css/list_menu.css
+++ /dev/null
@@ -1,7 +0,0 @@
-#tabbable_list_menu {
-    padding-right: 50px;
-}
-
-#tab-content_list_menu {
-    padding-top: 10px;
-}
\ No newline at end of file
diff --git a/uVote/page/user_list/list_menu.tpl b/uVote/page/user_list/list_menu.tpl
deleted file mode 100644
index 04ae49d..0000000
--- a/uVote/page/user_list/list_menu.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="tabbable" id="tabbable_list_menu">
-    <ul class="nav nav-tabs" id="tabs_user_list">
-        <li class="active"><a href="#tab_active" action="user_list_active">aktive Abstimmungen</a></li>
-        <li class=""><a href="#tab_ended" action="user_list_ended">abgelaufene Abstimmungen</a></li>       
-    </ul>
-    <div class="tab-content" id="tab-content_list_menu">        
-        <div class="tab-pane active" id="tab_active">${active}</div>
-        <div class="tab-pane" id="tab_ended" style="overflow: hidden;"></div>
-    </div>
-</div>
-
diff --git a/uVote/page/user_list/user_list.php b/uVote/page/user_list/user_list.php
deleted file mode 100644
index f2e8a3c..0000000
--- a/uVote/page/user_list/user_list.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class user_list extends SYSTEM\PAGE\Page {      
-    
-     private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'user_list/css/list_menu.css').'" rel="stylesheet">';}
-    
-    public function html(){ 
-        $vars = array();
-
-        $uv = new user_list_active();
-        $vars['css'] = $this->css();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; 
-        $vars['active'] = $uv->html();
-        
-        
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list/list_menu.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_list_active/active.tpl b/uVote/page/user_list_active/active.tpl
deleted file mode 100644
index 3955133..0000000
--- a/uVote/page/user_list_active/active.tpl
+++ /dev/null
@@ -1 +0,0 @@
-${votetlist}
\ No newline at end of file
diff --git a/uVote/page/user_list_active/user_list_active.php b/uVote/page/user_list_active/user_list_active.php
deleted file mode 100644
index acd2abb..0000000
--- a/uVote/page/user_list_active/user_list_active.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-class user_list_active extends SYSTEM\PAGE\Page { 
-    
-    private function get_party_per_poll($choice){
-        switch($choice){
-            case 1:
-                return 'PRO';
-            case 2:
-                return 'CON';
-            case 3:
-                return 'ENT';
-            default:
-                return 'NONE';
-        }           
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'con';
-            case 3:
-                return 'ent';
-            default:
-                return 'open';
-        }        
-    }
-    
-    private static function badge_class($choice){
-        switch($choice){
-            case 1:
-                return 'badge-success';
-            case 2:
-                return 'badge-important';
-            case 3:
-                return 'badge-info';
-            default:
-                return '';
-        }
-    }
-    
-    public function generate_votelist(){        
-        $result = array('','');
-        $votes = votes::getAllVotesOfGroup(1);               
-        foreach($votes as $vote){
-            $time_remain = strtotime($vote['time_end'])-  microtime(true);
-            $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
-            $vote_count = votes::get_count_user_votes_per_poll($vote['ID']);
-            
-//            $vote['title'] = utf8_encode($vote['title']);            
-            $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
-            $vote['time_done'] = 100-$vote['time_left'];
-            
-            $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen';            
-            $vote['uv'] = $vote['bt'] = '';            
-            $vote['uv_count'] = $vote_count['count'] > 4 ? $vote_count['count'] : '< 5';
-            
-            $user_vote = votes::getUserPollData($vote['ID']);
-            $vote['vote_class'] = $this->tablerow_class($user_vote);
-            if($user_vote){
-                //user vote
-                $vote['vote_class'] = $this->tablerow_class($user_vote);                
-
-                //bt vote
-                $party_votes = votes::get_barsperparty($vote['ID']);
-                $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']);
-                foreach($party_votes as $pv){
-                    $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_bt.tpl'),
-                                    array(  'party' => $pv['party'],
-                                            'choice' => $this->get_party_per_poll($pv['choice']),
-                                            'choice_class' => $this->badge_class($pv['choice'])));                    
-                }                        
-
-                //uvote vote
-                $uvote = votes::get_users_choice_per_poll($vote['ID']);                
-                $vote['uv_vote_class'] = count($uvote) > 0 ? $this->tablerow_class($uvote[0]['choice']) : '';                                
-                foreach($uvote as $v){
-                    $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'),
-                                    array(  'badge' => self::badge_class($v['choice']),
-                                            'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0));
-                }
-            }
-            
-            //new panels:
-            $vote['panel_class'] = default_page::panel_class($user_vote);
-            
-            if($time_remain > 0){               
-                $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            } else {
-                $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            }
-        }
-        return $result[0].$result[1];
-    }
- 
-    public function html(){
-        $vars = array();
-        $vars['votelist'] = $this->generate_votelist();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(110));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_active/active.tpl'), $vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_list_ended/ended.tpl b/uVote/page/user_list_ended/ended.tpl
deleted file mode 100644
index f2cef67..0000000
--- a/uVote/page/user_list_ended/ended.tpl
+++ /dev/null
@@ -1 +0,0 @@
-${votelist}
\ No newline at end of file
diff --git a/uVote/page/user_list_ended/user_list_ended.php b/uVote/page/user_list_ended/user_list_ended.php
deleted file mode 100644
index 55a6b8a..0000000
--- a/uVote/page/user_list_ended/user_list_ended.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-class user_list_ended extends SYSTEM\PAGE\Page { 
-    private function get_party_per_poll($choice){
-        switch($choice){
-            case 1:
-                return 'PRO';
-            case 2:
-                return 'CON';
-            case 3:
-                return 'ENT';
-            default:
-                return 'NONE';
-        }           
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'con';
-            case 3:
-                return 'ent';
-            default:
-                return 'open';
-        }        
-    }
-    
-    private static function badge_class($choice){
-        switch($choice){
-            case 1:
-                return 'badge-success';
-            case 2:
-                return 'badge-important';
-            case 3:
-                return 'badge-info';
-            default:
-                return '';
-        }
-    }
-    
-    public function generate_votelist(){        
-        $result = array('','');
-        $votes = votes::getAllExpVotesOfGroup(1);               
-        foreach($votes as $vote){
-            $time_remain = strtotime($vote['time_end'])-  microtime(true);
-            $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
-            $vote_count = votes::get_count_user_votes_per_poll($vote['ID']);
-            
-            $vote['title'] = utf8_encode($vote['title']);            
-            $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
-            $vote['time_done'] = 100-$vote['time_left'];
-            
-            $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen';            
-            $vote['uv'] = $vote['bt'] = '';            
-            $vote['uv_count'] = $vote_count['count'] > 4 ? $vote_count['count'] : '< 5';
-            
-            $user_vote = votes::getUserPollData($vote['ID']);
-            $vote['vote_class'] = $this->tablerow_class($user_vote);
-            if($user_vote){
-                //user vote
-                $vote['vote_class'] = $this->tablerow_class($user_vote);                
-
-                //bt vote
-                $party_votes = votes::get_barsperparty($vote['ID']);
-                $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']);
-                foreach($party_votes as $pv){
-                    $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_bt.tpl'),
-                                    array(  'party' => $pv['party'],
-                                            'choice' => $this->get_party_per_poll($pv['choice']),
-                                            'choice_class' => $this->badge_class($pv['choice'])));                    
-                }                        
-
-                //uvote vote
-                $uvote = votes::get_users_choice_per_poll($vote['ID']);                
-                $vote['uv_vote_class'] = count($uvote) > 0 ? $this->tablerow_class($uvote[0]['choice']) : '';                                
-                foreach($uvote as $v){
-                    $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'),
-                                    array(  'badge' => self::badge_class($v['choice']),
-                                            'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0));
-                }
-            }
-            
-            //new panels:
-            $vote['panel_class'] = default_page::panel_class($user_vote);
-            
-            if($time_remain > 0){               
-                $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            } else {
-                $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
-            }
-        }
-        return $result[0].$result[1];
-    }
- 
-    public function html(){
-        $vars = array();
-        $vars['votelist'] = $this->generate_votelist();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(110));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_ended/ended.tpl'), $vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_main/main_menu.tpl b/uVote/page/user_main/main_menu.tpl
deleted file mode 100644
index a148e52..0000000
--- a/uVote/page/user_main/main_menu.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="tabbable" id="tabbable_main_menu">
-    <ul class="nav nav-tabs" id="tabs_user_main">
-        <li class="active"><a href="#tab_uVote" action="user_main_uVote">uVote</a></li>
-        <li><a href="#tab_urVote" action="user_main_urVote">urVote</a></li>
-        <li><a href="#tab_myVote" action="user_main_myVote">myVote</a></li>        
-    </ul>
-    <div class="tab-content">        
-        <div class="tab-pane active" id="tab_uVote">${uVote}</div>
-        <div class="tab-pane" id="tab_urVote" style="overflow: hidden;"></div>
-        <div class="tab-pane" id="tab_myVote"></div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapse_feedback">Feedback</a>
-            </h4>
-        </div>            
-        <div id="collapse_feedback" class="panel-collapse collapse in">
-            <div class="panel-body">
-                <form>
-                    <br /><img src="${frontend_logos}logo2.png" width="180"/>
-                    <h4>uVote BETA Feedback</h4>
-                    <textarea id="feedback_text">Sag uns was dich stört!</textarea>
-                    <br />
-                    <input type="submit" id="feedback_submit" />
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/uVote/page/user_main/user_main.php b/uVote/page/user_main/user_main.php
deleted file mode 100644
index 2f86906..0000000
--- a/uVote/page/user_main/user_main.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-class user_main extends SYSTEM\PAGE\Page {      
-    
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'user_main/css/main_menu.css').'" rel="stylesheet">';}
-    public function html(){ 
-        $vars = array();
-
-        $uv = new user_main_uVote();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; 
-        $vars['uVote'] = $uv->html();
-        
-        
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main/main_menu.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_main_myVote/css/myVote.css b/uVote/page/user_main_myVote/css/myVote.css
deleted file mode 100644
index 79adac0..0000000
--- a/uVote/page/user_main_myVote/css/myVote.css
+++ /dev/null
@@ -1,12 +0,0 @@
-#myVote_main {
-    width: 100%; 
-    padding-top: 10px;
-}
-#myVote_sub1 {
-    float: left; 
-    margin-top: 30px;
-}
- 
-#myVote_sub2 {
-    float: right;
-}
\ No newline at end of file
diff --git a/uVote/page/user_main_myVote/myVote.tpl b/uVote/page/user_main_myVote/myVote.tpl
deleted file mode 100644
index fbf00cf..0000000
--- a/uVote/page/user_main_myVote/myVote.tpl
+++ /dev/null
@@ -1,167 +0,0 @@
-<div id="myVote_main">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                Einstellungen
-            </h4>
-        </div>        
-            <div class="panel-body">                    
-                <div id="myVote_sub1">${myvote_bodytext}</div>
-                <div id="myVote_sub2">
-                    <form action="" name="someform">
-                        ${location}<br>
-                        <select id="location" name="location">
-                           <option value="0">${keineangaben_location}</option>
-                            <option value="1">Baden-Württemberg</option>
-                            <option value="2">Bayern</option>
-                            <option value="3">Berlin</option>
-                            <option value="4">Brandenburg</option>
-                            <option value="5">Bremen</option>
-                            <option value="6">Hamburg</option>
-                            <option value="7">Hessen</option>
-                            <option value="8">Mecklenburg-Vorpommern</option>
-                            <option value="9">Niedersachsen</option>
-                            <option value="10">Nordrhein-Westfalen</option>
-                            <option value="11">Rheinland-Pfalz</option>
-                            <option value="12">Saarland</option>
-                            <option value="13">Sachsen</option>
-                            <option value="14">Sachsen-Anhalt</option>
-                            <option value="15">Schleswig-Holstein</option>
-                            <option value="16">Thüringen</option>
-                        </select>
-                        <br>
-                        ${birthyear}<br>
-                        <select id="birthyear" name="birthyear">
-                            <option value="0">${keineangaben_age}</option>
-                            <option value="2007">2007</option>
-                            <option value="2006">2006</option>
-                            <option value="2005">2005</option>
-                            <option value="2004">2004</option>
-                            <option value="2003">2003</option>
-                            <option value="2002">2002</option>
-                            <option value="2001">2001</option>
-                            <option value="2000">2000</option>
-                            <option value="1999">1999</option>
-                            <option value="1998">1998</option>
-                            <option value="1997">1997</option>
-                            <option value="1996">1996</option>
-                            <option value="1995">1995</option>
-                            <option value="1994">1994</option>
-                            <option value="1993">1993</option>
-                            <option value="1992">1992</option>
-                            <option value="1991">1991</option>
-                            <option value="1990">1990</option>
-                            <option value="1989">1989</option>
-                            <option value="1988">1988</option>
-                            <option value="1987">1987</option>
-                            <option value="1986">1986</option>
-                            <option value="1985">1985</option>
-                            <option value="1984">1984</option>
-                            <option value="1983">1983</option>
-                            <option value="1982">1982</option>
-                            <option value="1981">1981</option>
-                            <option value="1980">1980</option>
-                            <option value="1979">1979</option>
-                            <option value="1978">1978</option>
-                            <option value="1977">1977</option>
-                            <option value="1976">1976</option>
-                            <option value="1975">1975</option>
-                            <option value="1974">1974</option>
-                            <option value="1973">1973</option>
-                            <option value="1972">1972</option>
-                            <option value="1971">1971</option>
-                            <option value="1970">1970</option>
-                            <option value="1969">1969</option>
-                            <option value="1968">1968</option>
-                            <option value="1967">1967</option>
-                            <option value="1966">1966</option>
-                            <option value="1965">1965</option>
-                            <option value="1964">1964</option>
-                            <option value="1963">1963</option>
-                            <option value="1962">1962</option>
-                            <option value="1961">1961</option>
-                            <option value="1960">1960</option>
-                            <option value="1959">1959</option>
-                            <option value="1958">1958</option>
-                            <option value="1957">1957</option>
-                            <option value="1956">1956</option>
-                            <option value="1955">1955</option>
-                            <option value="1954">1954</option>
-                            <option value="1953">1953</option>
-                            <option value="1952">1952</option>
-                            <option value="1951">1951</option>
-                            <option value="1950">1950</option>
-                            <option value="1949">1949</option>
-                            <option value="1948">1948</option>
-                            <option value="1947">1947</option>
-                            <option value="1946">1946</option>
-                            <option value="1945">1945</option>
-                            <option value="1944">1944</option>
-                            <option value="1943">1943</option>
-                            <option value="1942">1942</option>
-                            <option value="1941">1941</option>
-                            <option value="1940">1940</option>
-                            <option value="1939">1939</option>
-                            <option value="1938">1938</option>
-                            <option value="1937">1937</option>
-                            <option value="1936">1936</option>
-                            <option value="1935">1935</option>
-                            <option value="1934">1934</option>
-                            <option value="1933">1933</option>
-                            <option value="1932">1932</option>
-                            <option value="1931">1931</option>
-                            <option value="1930">1930</option>
-                            <option value="1929">1929</option>
-                            <option value="1928">1928</option>
-                            <option value="1927">1927</option>
-                            <option value="1926">1926</option>
-                            <option value="1925">1925</option>
-                            <option value="1924">1924</option>
-                            <option value="1923">1923</option>
-                            <option value="1922">1922</option>
-                            <option value="1921">1921</option>
-                            <option value="1920">1920</option>
-                            <option value="1919">1919</option>
-                            <option value="1918">1918</option>
-                            <option value="1917">1917</option>
-                            <option value="1916">1916</option>
-                            <option value="1915">1915</option>
-                            <option value="1914">1914</option>
-                            <option value="1913">1913</option>
-                            <option value="1912">1912</option>
-                            <option value="1911">1911</option>
-                            <option value="1910">1910</option>
-                            <option value="1909">1909</option>
-                            <option value="1908">1908</option>
-                            <option value="1907">1907</option>
-                            <option value="1906">1906</option>
-                            <option value="1905">1905</option>
-                            <option value="1904">1904</option>
-                            <option value="1903">1903</option>
-                            <option value="1902">1902</option>
-                            <option value="1901">1901</option>
-                            <option value="1900">1900</option>
-                        </select>
-                        <br>
-                        ${gender} <br>
-                        <select id="gender" name="gender">
-                            <option value="0">${keineangaben_gender}</option>
-                            <option value="1">${male}</option>
-                            <option value="2">${female}</option>
-                            <option value="3">${none}</option>
-                            <option value="0">${no_data}</option>
-                        </select>
-                        <br>    
-                        ${children}<br>
-                        <select id="children" name="children">
-                            <option value="1">${keineangaben_children}</option>
-                            <option value="1">${yes}</option>
-                            <option value="2">${no}</option>
-                            <option value="0">${no_data}</option>        
-                        </select>
-                    </form>
-                    <div class="btn btn-primary add_data_submit" id="add_data_submit">Absenden</div>
-                </div>            
-        </div>
-    </div>        
-</div>
\ No newline at end of file
diff --git a/uVote/page/user_main_myVote/user_main_myVote.php b/uVote/page/user_main_myVote/user_main_myVote.php
deleted file mode 100644
index 536b4a3..0000000
--- a/uVote/page/user_main_myVote/user_main_myVote.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-class user_main_myVote extends SYSTEM\PAGE\Page { 
-    
-    public function get_add_data (){
-        $qqresult = votes::get_add_data();
-        $vars['keineangaben_location'] = $qqresult['location'] ? $qqresult['location'] : 'Keine Angaben';
-        $vars['keineangaben_age'] = $qqresult['birthyear'] ? $qqresult['birthyear'] : 'Keine Angaben';
-        $vars['keineangaben_gender'] = $qqresult['gender'] ? $qqresult['gender'] : 'Keine Angaben';
-        $vars['keineangaben_children'] = $qqresult['children'] ? $qqresult['children'] : 'Keine Angaben';
-        return $vars;
-        
- 
-        
-    }
-    
-    private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'user_main_myVote/css/myVote.css').'" rel="stylesheet">';}
-    
-    public function html(){
-        $vars = array();
-        $vars = $this->get_add_data();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(110));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_myVote/myVote.tpl'), $vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_main_uVote/bt_to_uvote_overall.tpl b/uVote/page/user_main_uVote/bt_to_uvote_overall.tpl
deleted file mode 100644
index 34cff78..0000000
--- a/uVote/page/user_main_uVote/bt_to_uvote_overall.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-    <td style="border-top: 1px solid black;">
-    <img src="${frontend_logos}icon_bt.png"/>
-    </td>
-    <td><span class="badge badge-success">${class_MATCH}</span></td>
-    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
-    <td><span class="badge">${match_percentage}%</span></td>
-</tr>    
\ No newline at end of file
diff --git a/uVote/page/user_main_uVote/uVote.tpl b/uVote/page/user_main_uVote/uVote.tpl
deleted file mode 100644
index fe3cad5..0000000
--- a/uVote/page/user_main_uVote/uVote.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<div style="width: 100%; padding-top: 10px;">
-    <div class="panel-group" id="accordion">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    Welcome
-                </h4>
-            </div>            
-            <div class="panel-body">
-                ${welcome_text}
-            </div>            
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">Übereinstimmung von uVote & Politik</a>
-                </h4>
-            </div>
-            <div id="collapseOne" class="panel-collapse collapse in">
-                <div class="panel-body">
-                    <div style="float: left;">
-                        <table style="border-collapse: separate; border-spacing: 10px 5px; width: 350px;">           
-                            <tr>
-                             <h5>Übereinstimmung von uVote & Politik</h5>
-                             ${uvote_to_bt}
-                             </tr>
-                        </table>
-                    </div>
-                    <div id="graph_bt_uv_overall" style="float: left; width: 300px;"></div>
-                    <script type="text/javascript" language="JavaScript">load_visualisation('graph_bt_uv_overall',84600);</script>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">Entscheidungsverhalten der uVote Community / Bundestag</a>
-                </h4>
-            </div>
-            <div id="collapseTwo" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div style="width: 50%; margin-bottom: 30px; float: left;">   
-                        <h5>Entscheidungsverhalten der uVote Community</h5>
-                        <span style="">
-                        ${votes_all}
-                        </span>
-                        <span style="">  Wie oft die uVote Community 
-                            <br>  insgesamt Dafür, Dagegen oder 
-                            <br>  Enthaltung gestimmt hat.</span>
-                    </div>
-                    <div style="width: 50%; float: right;">
-                        <h5>Entscheidungsverhalten des Bundestags</h5>
-                        <span style="">
-                        ${votes_all_bt}
-                        </span>
-                        <span style="">  Wie oft der Bundestag 
-                            <br>  Dafür, Dagegen oder 
-                            <br>  Enthaltung gestimmt hat.</span>    
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">uVote Community</a>
-                </h4>
-            </div>
-            <div id="collapseThree" class="panel-collapse collapse">
-                <div class="panel-body">                    
-                    <span class="badge badge-info">${user_count}</span> Nutzer auf uVote
-                </div>
-            </div>
-        </div>
-    </div>                       
-</div>
diff --git a/uVote/page/user_main_uVote/user_main_uVote.php b/uVote/page/user_main_uVote/user_main_uVote.php
deleted file mode 100644
index c7bc9dc..0000000
--- a/uVote/page/user_main_uVote/user_main_uVote.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-class user_main_uVote extends SYSTEM\PAGE\Page {    
-   
-   private function uvote_to_parties (){
-       $votes = votes::get_uvote_to_bt_overall();
-       $result = '';
-       
-       foreach($votes as $vote){
-           $vote['match_percentage'] = round($vote['class_MATCH']/($vote['class_MATCH']+$vote['class_MISSMATCH'])*100,2);
-           $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/uvoteparties.tpl'), $vote);
-       }
-       print_r($votes, TRUE);
-       return $result;
-   }
-    
-    
-    private function votes_all(){
-        $votes = votes::get_all_votes();
-        $result = '';
-        foreach($votes as $vote){
-            switch($vote['choice']){
-                case 1:
-                    $vote['choice'] = 'PRO';
-                    $vote['badge_color'] = 'badge-success';
-                    break;
-                case 2:
-                    $vote['choice'] = 'CON';
-                    $vote['badge_color'] = 'badge-important';
-                    break;
-                case 3:
-                    $vote['choice'] = 'ENT';
-                    $vote['badge_color'] = 'badge-info';
-                    break;
-            }
-            //$vote['count'];
-            //$vote['choice'];
-            $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/votecountchoice.tpl'),$vote);
-        }
-        return $result;        
-    } 
-    private function votes_all_bt(){
-        $votes = votes::get_all_votes_bt();
-        $result = '';
-        foreach($votes as $vote){
-            switch($vote['bt_choice']){
-                case 1:
-                    $vote['bt_choice'] = 'PRO';
-                    $vote['badge_color'] = 'badge-success';
-                    break;
-                case 2:
-                    $vote['bt_choice'] = 'CON';
-                    $vote['badge_color'] = 'badge-important';
-                    break;
-                case 3:
-                    $vote['bt_choice'] = 'ENT';
-                    $vote['badge_color'] = 'badge-info';
-                    break;
-                case 0:
-                    $vote['bt_choice'] = 'OFFEN';
-            }
-            //$vote['count'];
-            //$vote['choice'];
-            $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/votecountchoicebt.tpl'),$vote);
-        }
-        return $result;        
-    } 
-    
-    private function user_count(){
-        $vars = votes::get_user_count();       
-        return $vars['count'];
-    }
-
-    
-
-    public function html(){                 
-        $vars = array();
-        $vars['uvote_to_bt'] = $this->uvote_to_parties();
-        $vars['votes_all'] = $this->votes_all();
-        $vars['votes_all_bt'] = $this->votes_all_bt();
-        $vars['user_count'] = $this->user_count();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/uVote.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/page/user_main_uVote/uvoteparties.tpl b/uVote/page/user_main_uVote/uvoteparties.tpl
deleted file mode 100644
index 8c30031..0000000
--- a/uVote/page/user_main_uVote/uvoteparties.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-    <td>
-    <img src="${frontend_logos}icon_${party}.png"/>
-    </td>
-    <td><span class="badge badge-success">${class_MATCH}</span></td>
-    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
-    <td><span class="badge">${match_percentage}%</span></td>      
-</tr>   
\ No newline at end of file
diff --git a/uVote/page/user_main_uVote/votecountchoice.tpl b/uVote/page/user_main_uVote/votecountchoice.tpl
deleted file mode 100644
index 1b6f8ea..0000000
--- a/uVote/page/user_main_uVote/votecountchoice.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-<span class="badge" style="">${choice}</span>
-<span class="badge ${badge_color}" style="">${count}</span>
-
-</div>
diff --git a/uVote/page/user_main_uVote/votecountchoicebt.tpl b/uVote/page/user_main_uVote/votecountchoicebt.tpl
deleted file mode 100644
index 3e74993..0000000
--- a/uVote/page/user_main_uVote/votecountchoicebt.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-<span class="badge" style="">${bt_choice}</span>
-<span class="badge ${badge_color}" style="">${count}</span>
-</div>
diff --git a/uVote/page/user_main_urVote/all_polls.tpl b/uVote/page/user_main_urVote/all_polls.tpl
deleted file mode 100644
index b57717f..0000000
--- a/uVote/page/user_main_urVote/all_polls.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div style="padding-bot: 20px;">
-<h5>Aktueller Status</h5>
-</div>
-<div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
-    <font size="2">Teilnahme an aktuellen Abstimmungen</font>
-    <div class="progress" style="height: 20px;">   
-        <div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
-        <div class="bar bar-info" style="width: 100%;"></div>  
-    </div>
-    <div style="">
-        <font size="1">Teilgenommen: ${voted}, nicht Teilgenommen: ${not_voted}</font>
-    </div>
-</div>
-<br>
diff --git a/uVote/page/user_main_urVote/bt_to_user_overall.tpl b/uVote/page/user_main_urVote/bt_to_user_overall.tpl
deleted file mode 100644
index cd2c1f8..0000000
--- a/uVote/page/user_main_urVote/bt_to_user_overall.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-    <td style="border-top: 1px solid black;">
-    <img src="${frontend_logos}icon_bt.png"/>
-    </td>
-    <td><span class="badge badge-success">${class_MATCH}</span></td>
-    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
-    <td><span class="badge">${match_percentage}</span></td>
-</tr>    
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/overall_all_polls.tpl b/uVote/page/user_main_urVote/overall_all_polls.tpl
deleted file mode 100644
index bcafd92..0000000
--- a/uVote/page/user_main_urVote/overall_all_polls.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
-    <font size="2">Abstimmungsquote seit Accounterstellung</font>
-    <div class="progress" style="height: 20px;">   
-      <div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
-      <div class="bar bar-info" style=""></div>     
-    </div>
-      <div style="">
-      <font size="1">Teilgenommen: ${voted},
-      nicht Teilgenommen: ${not_voted}</font>
-      </div>
-</div>
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
deleted file mode 100644
index 2ed1719..0000000
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-<div id="statistics_uvote_users" style="width: 100%; padding-top:10px;">            
-    
-    <div class="panel-group" id="accordion">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    ${urVote_title}
-                </h4>
-            </div>            
-            <div class="panel-body">
-                ${urvote_body_text}
-            </div>            
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_1">Übereinstimmung von Deiner uVote-Stimme & Politik</a>
-                </h4>
-            </div>
-            <div id="collapse_urVote_1" class="panel-collapse collapse in">
-                <div class="panel-body">
-                    <div style="float: left; width: 49%;">
-                        <table style="border-collapse: separate;
-                            border-spacing: 10px 5px; width: 350px;"> 
-                            <tr>
-                            <h5>${urVote_user_party_compare}</h5>
-                            ${urvote_user_party_compare_sub}
-                            ${choices_user_ID}
-                            </tr>
-
-                            <tr>
-                            ${choices_bt_to_user}
-                            </tr>               
-                        </table>                        
-                    </div>
-                    <div id="right_float" style="float: right; width: 44%;">
-                    <div>${user_temp_votes}</div>
-                    <br>
-                    <div>${user_overall_votes}</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_2">Deine Übereinstimmung mit dem Bundestag</a>
-                </h4>
-            </div>
-            <div id="collapse_urVote_2" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div id="graph_bt_user_overall" style="float: left"></div>
-                    <script type="text/javascript" language="JavaScript">load_visualisation_urvote('graph_bt_user_overall',84600);</script>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_3">Collapsible Group Item #3</a>
-                </h4>
-            </div>
-            <div id="collapse_urVote_3" class="panel-collapse collapse">
-                <div class="panel-body">
-                    Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-                </div>
-            </div>
-        </div>
-    </div>   
-</div>
-        
-       
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urvoteparties.tpl b/uVote/page/user_main_urVote/urvoteparties.tpl
deleted file mode 100644
index cc85ac8..0000000
--- a/uVote/page/user_main_urVote/urvoteparties.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="urvoteparties_{party}">
-<tr>
-    <td>
-        <img src="${frontend_logos}icon_${party}.png"/>
-    </td>
-    <td><span class="badge badge-success">${class_MATCH}</span></td>
-    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
-    <td><span class="badge">
-            <a class="urvoteparties_uvote_popover" data-content="${according_laws}">${match_percentage}%</a>
-        </span>
-    </td>
-</tr>    
-</div>
-<script> 
-$(function ()  
-{ $(".urvoteparties_uvote_popover").popover({html: true});  
-});  
-</script>  
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/user_main_urVote.php b/uVote/page/user_main_urVote/user_main_urVote.php
deleted file mode 100644
index 6889e5d..0000000
--- a/uVote/page/user_main_urVote/user_main_urVote.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-class user_main_urVote extends SYSTEM\PAGE\Page { 
-    
-    
-    
-    private function user_overall_votes (){
-        $vars = votes::get_user_overall_votes(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->creationDate);
-        $v = $vars['voted'] > 1 ? $vars['voted'] : 1;
-        $nv = $vars['not_voted'];
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/overall_all_polls.tpl'),
-                array(  'vote_perc'=> round($v/($nv+$v)*100, 2),
-                        'no_vote_perc'=> round($nv/($nv+$v)*100, 2),
-                        'voted'=> $v,
-                        'not_voted'=> $nv));
-    }
-    
-    private function user_temp_votes (){
-        $vars = votes::get_user_temp_votes(\SYSTEM\SECURITY\Security::getUser()->id);
-        $v = $vars['voted'];
-        $nv = $vars['not_voted'];
-        print_r($vars, true);
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/all_polls.tpl'),
-                array(  'vote_perc'=> round($v/($nv+$v)*100, 2),
-                        'no_vote_perc'=> round($nv/($nv+$v)*100, 2),
-                        'voted'=> $v,
-                        'not_voted'=> $nv));
-    }
-
-    private function user_to_bt(){
-    //$vars = votes::get_user_per_party_overall($user_ID);
-    $result = '';
-    $con = new \SYSTEM\DB\Connection();
-    $res = $con->prepare(   'bt_to_user',
-                            'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH,
-                            sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH 
-                            FROM uvote_data LEFT JOIN uvote_votes 
-                            ON uvote_data.poll_ID = uvote_votes.ID 
-                            WHERE user_ID = ?;',
-                            array(\SYSTEM\SECURITY\Security::getUser()->id));
-    while($row = $res->next()){
-        $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH']+1)*100,2);
-
-        $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/bt_to_user_overall.tpl'), $row);
-    }
-    return $result;   
-    $row['votes_cast'] = round(($row['class_MATCH']+$row['class_MISSMATCH']),2);
-}
-
-
-
-    private function user_per_party_overall(){
-    //$vars = votes::get_user_per_party_overall(array(\SYSTEM\SECURITY\Security::getUser()->id));        
-    $result = '';
-    $con = new \SYSTEM\DB\Connection();
-    $res = $con->prepare(   'test',
-                            'SELECT party, sum(case when uvote_data.choice = uvote_votes_per_party.choice then 1 else 0 end) class_MATCH,
-                                           sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH 
-                            FROM uvote_data INNER JOIN uvote_votes_per_party 
-                                ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
-                            WHERE user_ID = ? GROUP BY party;',
-                            array(\SYSTEM\SECURITY\Security::getUser()->id));
-    $i = 0;
-    while($row = $res->next()){
-        
-        $res2 = votes::vote_accord_with_party($row['party']);
-        $row['according_laws'] = $this->build_according_law_html($res2, $row['party']);
-        $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2);
-        $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urvoteparties.tpl'), $row);;
-    }
-    return $result;        
-}
-    public function build_according_law_html($part, $party){
-        $part = json_decode($part, true);
-        $result = "<div><font color='black'><h6><i>Bei folgenden Gesetzen hast du genauso abgestimmt wie die '".$party."':</i></h6><hr>";
-        foreach ($part['result'] as $p){
-            $result .= $p['title']."<hr>";
-        }
-        $result .= "</font></div>";
-        new INFO($result);
-        return $result;
-    }
-    public function html(){
-        $vars = array();
-//        $vars['poll_compare'] = $this->count_all_polls();        
-        $vars['choices_user_ID'] = $this->user_per_party_overall();
-        $vars['choices_bt_to_user'] = $this->user_to_bt();      
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        $vars['user_temp_votes'] = $this->user_temp_votes();
-        $vars['user_overall_votes'] = $this->user_overall_votes();
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urVote.tpl'),$vars);
-    }
-  
-}
\ No newline at end of file
diff --git a/uVote/path/PLIB.php b/uVote/path/PLIB.php
deleted file mode 100644
index f0bb5dd..0000000
--- a/uVote/path/PLIB.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-class PLIB extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'lib/'.\SYSTEM\C_SUBPATH;}
-}
diff --git a/uVote/path/PPAGE.php b/uVote/path/PPAGE.php
deleted file mode 100644
index 27aa698..0000000
--- a/uVote/path/PPAGE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-class PPAGE extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'uVote/page/'.\SYSTEM\C_SUBPATH;}
-}
diff --git a/uVote/path/PSAI.php b/uVote/path/PSAI.php
deleted file mode 100644
index 0cf348e..0000000
--- a/uVote/path/PSAI.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-class PSAI extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'uVote/sai/'.\SYSTEM\C_SUBPATH;}
-}
diff --git a/uVote/path/register_path_classes.php b/uVote/path/register_path_classes.php
deleted file mode 100644
index d94a324..0000000
--- a/uVote/path/register_path_classes.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file
diff --git a/uVote/sai/autoload.inc.php b/uVote/sai/autoload.inc.php
deleted file mode 100644
index 6efc10b..0000000
--- a/uVote/sai/autoload.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_uvote_vote_edit','');
diff --git a/uVote/sai/register_modules.php b/uVote/sai/register_modules.php
deleted file mode 100644
index e56cea1..0000000
--- a/uVote/sai/register_modules.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-\SYSTEM\SAI\sai::register('saimod_uvote_vote_edit');
\ No newline at end of file
diff --git a/uVote/sai/saimod_uvote_vote_edit/main.tpl b/uVote/sai/saimod_uvote_vote_edit/main.tpl
deleted file mode 100644
index c7c8cca..0000000
--- a/uVote/sai/saimod_uvote_vote_edit/main.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div>
-<input type="text" id="vote_title" placeholder="${vote_title}"/>
-<input type="text" id="iframe_link" placeholder="${iframe_link}"/>
-<input type="text" id="poll_ID" placeholder="${poll_ID}"/>
-<br>
-<br>
-<h4>poll start</h4>
-<input type="text" placeholder="JJJJ-TT-MM"/> - 00:00
-<h4>poll end</h4>
-<input type="text" placeholder="JJJJ-TT-MM"/> - 00:00
-<br>
-<a class="btn btn-primary" id="vote_data_submit">Submit</a>
-</div>
-<br>
-<div>
-    <h4>BT DATEN</h4>
-<input type="text" id="poll_ID" placeholder="${poll_ID}"/>
-<br>
-<input type="text" id="poll_ID" placeholder="${party}"/>
-<input type="text" id="poll_ID" placeholder="${votes_pro}"/>
-<input type="text" id="poll_ID" placeholder="${votes_contra}"/>
-<input type="text" id="poll_ID" placeholder="${nr_attending}"/>
-<input type="text" id="poll_ID" placeholder="${total}"/>
-<input type="text" id="poll_ID" placeholder="${choice}"/>
-<br>
-<a class="btn btn-primary" id="bt_data_submit">Submit</a>
-</div>
\ No newline at end of file
diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js
deleted file mode 100644
index 069cefd..0000000
--- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function init_saimod_uvote_vote_edit(){
-    
-    $('.btn_editvote').click(function() {
-        alert ('');
-        var poll_ID = $('#input_poll_title').attr('poll_ID');
-        var title = $('#input_poll_title').val();
-        var iframe_link = $('#input_poll_link').val();
-        vote_data_edit(poll_ID, title, iframe_link);
-        
-            
-    
-//    var data = new Array(); 
-//    alert("bla")
-//       $.ajax({
-//        url: SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_uvote_vote_edit&action='+ vote,
-//        contentType : "application/json; charset=utf-8",
-//        vote : JSON.stringify({
-//            sai_mod: 'saimod_uvote_vote_edit', 
-//            action: 'new_vote',
-//            json: data,           
-//        }),
-//        dataType : 'json',
-//        type : 'POST' ,
-//        success: function(vote) {
-//            alert("success");
-//        }});
-//        alert("js läuft");
-        })};
-
-
-
-
-function vote_data_edit (poll_ID, title, iframe_link) {
-    alert('vote_data_edit');
-    
-    $.getJSON('./api.php?call=vote&action=new_vote&poll_ID=' + poll_ID + '&title=' + title + '&iframe_link=' + iframe_link, function(data) {
-        var items = [];        
-        if(data.status == true){
-            alert("success");
-        } else {
-            alert(data.result.message);
-        }
-    }); 
-}
diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php
deleted file mode 100644
index 4c70d6f..0000000
--- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {  
-    public static function sai_mod__SYSTEM_SAI_saimod_uvote_vote_edit_action_new_vote($data){
-        new \SYSTEM\LOG\INFO('json kommt im php an');
-         $vote = $data;
-         $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-         $res = null;
-         $res = $con->prepare('INSERT INTO uvote_votes (poll_ID, title, text, p_fields, time_start, time_end) VALUES (?1, ?2, ?3, ?4, ?5, ?6);', array($poll_ID));        
-        return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added")) : \SYSTEM\LOG\JsonResult::ok();
-        new \SYSTEM\LOG\INFO($vote);
-    }
-    
-    public static function sai_mod_saimod_uvote_vote_edit_action_insertPartyChoice ($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice){
-        $vars = votes::insertPartyChoice($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice);       
-    }
-
-    public static function sai_mod_saimod_uvote_new_vote(){
-        $result = '';
-        $vote = array();
-        $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
-
-    }
-
-
-    public static function sai_mod_saimod_uvote_vote_edit(){       
-        /*$vars = array();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
-        return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/main.tpl', $vars);*/
-        
-        $result = '';
-//        $result.=self::sai_mod_saimod_uvote_new_vote();
-        $votes = votes::getAllVotesOfGroup(1);               
-        foreach($votes as $vote){
-            $time_remain = strtotime($vote['time_end'])-  microtime(true);
-            $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
-            $vote['vote_class'] = self::tablerow_class(votes::getUserPollData($vote['ID']));
-            $vote['bt_vote_class'] = self::tablerow_class($vote['bt_choice']);            
-            $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
-            $vote['time_done'] = 100-$vote['time_left'];
-            $vote['new_vote'] = self::sai_mod_saimod_uvote_new_vote();
-            $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
-        }
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('list' => $result));
-    }
-    
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'contra';
-            case 3:
-                return 'ent';
-            default:
-                return '';
-        }        
-    }
-        
-    public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_uvote_vote_edit">Edit Votes</a></li><li class="divider"></li>';}
-    public static function right_public(){return false;}    
-    public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function sai_mod_saimod_uvote_vote_edit_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
-            \SYSTEM\WEBPATH(new PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.js')
-    ));}
-    public static function sai_mod_saimod_uvote_vote_edit_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array()
-    );}
-}
\ No newline at end of file
diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl
deleted file mode 100644
index d37ceab..0000000
--- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<table style="margin-bottom: 5px; width: 95%; border: solid lightgray 1px; background: beige;">
-${new_vote}
-${list}
-</table>
\ No newline at end of file
diff --git a/uVote/sai/saimod_uvote_vote_edit/vote.tpl b/uVote/sai/saimod_uvote_vote_edit/vote.tpl
deleted file mode 100644
index 906565b..0000000
--- a/uVote/sai/saimod_uvote_vote_edit/vote.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<tr style="border: solid lightgray 1px;">    
-    <td style="padding: 5px;">            
-        <input id="input_poll_title" poll_ID="${ID}" type="text" value="${title}" style="width: 500px;">
-        <input id="input_poll_link" type="text" value="${iframe_link}" style="width: 500px;">
-    </td>
-    <td>
-        Nr.${ID}
-    </td>
-    <td>
-        <a class="btn btn-primary btn-small btn_editvote" style="float:right" poll_ID="${ID}">Edit</a>
-    </td>
-    <td class="${bt_vote_class}" style="width: 200px; margin-top: 10px; border-left: 1px solid lightgray;">            
-        cdu<span class="badge badge-success" style="float:left;"></span>
-        <span class="badge badge-important" style="float:left;">123</span>
-        <span class="badge" style="float:left;">123</span>
-        <span class="badge badge-info" style="float:left;">123</span><br/>
-        csu<span class="badge badge-success" style="float:left;">123</span>
-        <span class="badge badge-important" style="float:left;">123</span>
-        <span class="badge" style="float:left;">123</span>
-        <span class="badge badge-info" style="float:left;">123</span><br/>
-        spd<span class="badge badge-success" style="float:left;">123</span>
-        <span class="badge badge-important" style="float:left;">123</span>
-        <span class="badge" style="float:left;">123</span>
-        <span class="badge badge-info" style="float:left;">123</span><br/>
-        grüne<span class="badge badge-success" style="float:left;">123</span>
-        <span class="badge badge-important" style="float:left;">123</span>
-        <span class="badge" style="float:left;">123</span>
-        <span class="badge badge-info" style="float:left;">123</span><br/>
-        linke<span class="badge badge-success" style="float:left;">123</span>
-        <span class="badge badge-important" style="float:left;">123</span>
-        <span class="badge" style="float:left;">123</span>
-        <span class="badge badge-info" style="float:left;">123</span><br/>
-    </td>
-    <td class="" style="width: 30px; margin-top: 10px; border-left: 1px solid lightgray;">
-        uv
-        <span class="badge badge-success" style="float:right;">123</span>
-        <span class="badge badge-important" style="float:right;">123</span>
-        <span class="badge" style="float:right;">123</span>
-    </td>
-    <td class="${vote_class}" style="width: 20px; margin-top: 10px; border-left: 1px solid lightgray;">            
-    </td>
-    <td style="margin: 0; padding: 0; width: 3px;" >
-        <table class="poll_time" time="${time_end}" style="width: 100%; height: 100%; margin: 0; padding: 0;">
-            <tr id="time_done" style="height: ${time_done}%; background: white; margin: 0; padding: 0;"><td style="width: 1px; margin: 0; padding: 0;"></td></tr>
-            <tr id="time_left" style="height: ${time_left}%; background: blue; margin: 0; padding: 0;"><td style="width: 1px; margin: 0; padding: 0;"></td></tr>
-        </table>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/uVote/src/documents/Konzept.docx b/uVote/src/documents/Konzept.docx
deleted file mode 100644
index 2b3f48b..0000000
Binary files a/uVote/src/documents/Konzept.docx and /dev/null differ
diff --git a/uVote/src/documents/Kriterien.docx b/uVote/src/documents/Kriterien.docx
deleted file mode 100644
index 5286482..0000000
Binary files a/uVote/src/documents/Kriterien.docx and /dev/null differ
diff --git a/uVote/src/documents/Wissenschaftl. Ausarbeitung.docx b/uVote/src/documents/Wissenschaftl. Ausarbeitung.docx
deleted file mode 100644
index a14a9d4..0000000
Binary files a/uVote/src/documents/Wissenschaftl. Ausarbeitung.docx and /dev/null differ
diff --git a/uVote/src/documents/ueber iVote.docx b/uVote/src/documents/ueber iVote.docx
deleted file mode 100644
index 023205a..0000000
Binary files a/uVote/src/documents/ueber iVote.docx and /dev/null differ
diff --git a/uVote/src/pics/lgog.png b/uVote/src/pics/lgog.png
deleted file mode 100644
index befdd22..0000000
Binary files a/uVote/src/pics/lgog.png and /dev/null differ
diff --git a/uVote/src/pics/logo2.png b/uVote/src/pics/logo2.png
deleted file mode 100644
index e2e514e..0000000
Binary files a/uVote/src/pics/logo2.png and /dev/null differ
diff --git a/uVote/src/psd/Unbenannt-1.psd b/uVote/src/psd/Unbenannt-1.psd
deleted file mode 100644
index 3d52176..0000000
Binary files a/uVote/src/psd/Unbenannt-1.psd and /dev/null differ
diff --git a/uVote/src/psd/Unbenannt-2.psd b/uVote/src/psd/Unbenannt-2.psd
deleted file mode 100644
index 3bd01b5..0000000
Binary files a/uVote/src/psd/Unbenannt-2.psd and /dev/null differ
diff --git a/uVote/src/psd/myVote.psd b/uVote/src/psd/myVote.psd
deleted file mode 100644
index 92bfa9a..0000000
Binary files a/uVote/src/psd/myVote.psd and /dev/null differ