diff --git a/src/lang/.htaccess b/src/lang/.htaccess
deleted file mode 100644
index 3418e55..0000000
--- a/src/lang/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
deleted file mode 100644
index cab3fb2..0000000
--- a/src/lang/class.default.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-
-/*
-	myTinyTodo default language class
-*/
-
-class DefaultLang
-{
-	protected static $instance;
-	protected $rtl = 0;
-
-	private $default_js = array
-	(
-		'confirmDelete' => "Are you sure you want to delete the task?",
-		'confirmLeave' => "There can be unsaved data. Do you really want to leave?",
-		'actionNoteSave' => "save",
-		'actionNoteCancel' => "cancel",
-		'error' => "Some error occurred (click for details)",
-		'denied' => "Access denied",
-		'invalidpass' => "Wrong password",
-		'addList' => "Create new list",
-		'addListDefault' => "Todo",
-		'renameList' => "Rename list",
-		'deleteList' => "This will delete current list with all tasks in it.\\nAre you sure?",
-		'clearCompleted' => "This will delete all completed tasks in the list.\\nAre you sure?",
-		'settingsSaved' => "Settings saved. Reloading...",
-	);
-
-	private $default_inc = array
-	(
-		'My Tiny Todolist' => "My Tiny Todolist",
-		'htab_newtask' => "New task",
-		'htab_search' => "Search",
-		'btn_add' => "Add",
-		'btn_search' => "Search",
-		'advanced_add' => "Advanced",
-		'searching' => "Searching for",
-		'tasks' => "Tasks",
-		'taskdate_inline_created' => "created at %s",
-		'taskdate_inline_completed' => "Completed at %s",
-		'taskdate_inline_duedate' => "Due %s",
-		'taskdate_created' => "Created",
-		'taskdate_completed' => "Completed",
-		'go_back' => "&lt;&lt; Back",
-		'edit_task' => "Edit Task",
-		'add_task' => "New Task",
-		'priority' => "Priority",
-		'task' => "Task",
-		'note' => "Note",
-		'tags' => "Tags",
-		'save' => "Save",
-		'cancel' => "Cancel",
-		'password' => "Password",
-		'btn_login' => "Login",
-		'a_login' => "Login",
-		'a_logout' => "Logout",
-		'public_tasks' => "Public Tasks",
-		'tagcloud' => "Tags",
-		'tagfilter_cancel' => "cancel filter",
-		'sortByHand' => "Sort by hand",
-		'sortByPriority' => "Sort by priority",
-		'sortByDueDate' => "Sort by due date",
-		'sortByDateCreated' => "Sort by date created",
-		'sortByDateModified' => "Sort by date modified",
-		'due' => "Due",
-		'daysago' => "%d days ago",
-		'indays' => "in %d days",
-		'months_short' => array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"),
-		'months_long' => array("January","February","March","April","May","June","July","August","September","October","November","December"),
-		'days_min' => array("Su","Mo","Tu","We","Th","Fr","Sa"),
-		'days_long' => array("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"),
-		'today' => "today",
-		'yesterday' => "yesterday",
-		'tomorrow' => "tomorrow",
-		'f_past' => "Overdue",
-		'f_today' => "Today and tomorrow",
-		'f_soon' => "Soon",
-		'action_edit' => "Edit",
-		'action_note' => "Edit Note",
-		'action_delete' => "Delete",
-		'action_priority' => "Priority",
-		'action_move' => "Move to",
-		'notes' => "Notes:",
-		'notes_show' => "Show",
-		'notes_hide' => "Hide",
-		'list_new' => "New list",
-		'list_rename' => "Rename list",
-		'list_delete' => "Delete list",
-		'list_publish' => "Publish list",
-		'list_showcompleted' => "Show completed tasks",
-		'list_clearcompleted' => "Clear completed tasks",
-		'list_select' => "Select list",
-		'list_export' => "Export",
-		'list_export_csv' => "CSV",
-		'list_export_ical' => "iCalendar",		
-		'list_rssfeed' => "RSS Feed",
-		'alltags' => "All tags:",
-		'alltags_show' => "Show all",
-		'alltags_hide' => "Hide all",
-		'a_settings' => "Settings",
-		'rss_feed' => "RSS Feed",
-		'feed_title' => "%s",
-		'feed_completed_tasks' => "Completed tasks",
-		'feed_modified_tasks' => "Modified tasks",
-		'feed_new_tasks' => "New tasks",
-		'alltasks' => "All tasks",
-
-		/* Settings */
-		'set_header' => "Settings",
-		'set_title' => "Title",
-		'set_title_descr' => "(specify if you want to change default title)",
-		'set_language' => "Language",
-		'set_protection' => "Password protection",
-		'set_enabled' => "Enabled",
-		'set_disabled' => "Disabled",
-		'set_newpass' => "New password",
-		'set_newpass_descr' => "(leave blank if won't change current password)",
-		'set_smartsyntax' => "Smart syntax",
-		'set_smartsyntax_descr' => "(/priority/ task /tags/)",
-		'set_timezone' => "Time zone",
-		'set_autotag' => "Autotagging",
-		'set_autotag_descr' => "(automatically adds tag of current tag filter to newly created task)",
-		'set_sessions' => "Session handling mechanism",
-		'set_sessions_php' => "PHP",
-		'set_sessions_files' => "Files",
-		'set_firstdayofweek' => "First day of week",
-		'set_custom' => "Custom",
-		'set_date' => "Date format",
-		'set_date2' => "Short Date format",
-		'set_shortdate' => "Short Date (current year)",
-		'set_clock' => "Clock format",
-		'set_12hour' => "12-hour",
-		'set_24hour' => "24-hour",
-		'set_submit' => "Submit changes",
-		'set_cancel' => "Cancel",
-		'set_showdate' => "Show task date in list",
-	);
-
-	var $js = array();
-	var $inc = array();
-
-	function makeJS()
-	{
-		$a = array();
-		foreach($this->default_js as $k=>$v)
-		{
-			if(isset($this->js[$k])) $v = $this->js[$k];
-
-			if(is_array($v)) {
-				$a[] = "$k: ". $v[0];
-			} else {
-				$a[] = "$k: \"". str_replace('"','\\"',$v). "\"";
-			}
-		}
-		$t = array();
-		foreach($this->get('days_min') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
-		$a[] = "daysMin: [". implode(',', $t). "]";
-		$t = array();
-		foreach($this->get('days_long') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
-		$a[] = "daysLong: [". implode(',', $t). "]";
-		$t = array();
-		foreach($this->get('months_long') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
-		$a[] = "monthsLong: [". implode(',', $t). "]";
-		$a[] = $this->_2js('tags');
-		$a[] = $this->_2js('tasks');
-		$a[] = $this->_2js('f_past');
-		$a[] = $this->_2js('f_today');
-		$a[] = $this->_2js('f_soon');
-		return "{\n". implode(",\n", $a). "\n}";
-	}
-
-	function _2js($v)
-	{
-		return "$v: \"". str_replace('"','\\"',$this->get($v)). "\"";
-	}
-
-	function get($key)
-	{
-		if(isset($this->inc[$key])) return $this->inc[$key];
-		if(isset($this->default_inc[$key])) return $this->default_inc[$key];
-		return $key;
-	}
-
-	function rtl()
-	{
-		return $this->rtl ? 1 : 0;
-	}
-
-	public static function instance_deprecated()
-	{
-        if (!isset(self::$instance)) {
-			//$c = __CLASS__;
-			$c = 'Lang';
-			self::$instance = new $c;
-        }
-		return self::$instance;	
-	}
-	
-	public function json($langFile = '', $pretty = 0)
-	{
-		$a = array();
-		
-		if ($langFile != '') {
-			$ah = $this->loadLangHeader($langFile);
-			$a['_header'] = $ah;
-		}
-		
-		if ($this->rtl()) {
-			$a['_rtl'] = $this->rtl();
-		}
-		
-		foreach ( $this->default_inc as $k=>$v ) {
-			if ( isset($this->inc[$k]) ) {
-				$v = $this->inc[$k];
-			}
-			$a[$k] = $v;
-		}
-		
-		foreach ( $this->default_js as $k=>$v ) {
-			if ( isset($this->js[$k]) ) {
-				$v = $this->js[$k];
-			}
-			$v = str_replace("\\n", "\n", $v);
-			$a[$k] = $v;
-		}
-		
-		$encOptions = JSON_UNESCAPED_UNICODE;;
-		if ($pretty) {
-			$encOptions |= JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES;
-		}
-		return json_encode($a, $encOptions);
-	}
-	
-	function loadLangHeader($langFile)
-	{
-		if (!file_exists($langFile)) {
-			die("file does not exist: $langFile");
-		}
-		$contents = file_get_contents($langFile);
-
-		$a = array();
-		
-		# parse head comment
-		if(preg_match("|/\\*\s*myTinyTodo language pack([\s\S]+?)\\*/|", $contents, $m))
-		{
-			$str = $m[1];
-			if(preg_match("|AppVersion\s*:\s*(.+)|i", $str, $m)) {
-				$a['ver'] = trim($m[1]);
-			}
-			if(preg_match("|Date\s*:\s*(.+)|i", $str, $m)) {
-				$a['date'] = trim($m[1]);
-			}
-			if(preg_match("|Language\s*:\s*(.+)|i", $str, $m)) {
-				$a['language'] = trim($m[1]);
-			}
-			if(preg_match("|Original name\s*:\s*(.+)|i", $str, $m)) {
-				$a['original_name'] = trim($m[1]);
-			}
-			if(preg_match("|Author\s*:\s*(.+)|i", $str, $m)) {
-				$a['author'] = trim($m[1]);
-			}
-			if(preg_match("|Author URL\s*:(.+)|i", $str, $m)) {
-				$a['author_url'] = trim($m[1]);
-			}
-			if(preg_match("|Author Email\s*:(.+)|i", $str, $m)) {
-				$a['author_email'] = trim($m[1]);
-			}
-			if(preg_match("|Modified by\s*:(.+)|i", $str, $m)) {
-				$a['modified_by'] = trim($m[1]);
-			}
-		}
-
-		return $a;	
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/src/mytinytodo_lang.php b/src/mytinytodo_lang.php
index c89042d..d239fb1 100644
--- a/src/mytinytodo_lang.php
+++ b/src/mytinytodo_lang.php
@@ -12,7 +12,6 @@ if(isset($_GET['lang']) && preg_match("/^[a-z-]+$/i", $_GET['lang']) && file_exi
 }
 
 if ( isset($_GET['json']) || isset($_GET['jsonfile']) ) {
-	require_once(MTTPATH. 'lang/class.default.php');
 	require_once(MTTPATH. 'lang/'. $config['lang']. '.php');
 	header('Content-type: application/json; charset=utf-8');
 	if ( isset($_GET['jsonfile']) ) {
@@ -28,3 +27,273 @@ Lang::loadLang($config['lang']);
 header('Content-type: text/javascript; charset=utf-8');
 echo "mytinytodo.lang.init(". Lang::instance()->makeJS(1) .");";
 
+
+class DefaultLang
+{
+	protected static $instance;
+	protected $rtl = 0;
+
+	private $default_js = array
+	(
+		'confirmDelete' => "Are you sure you want to delete the task?",
+		'confirmLeave' => "There can be unsaved data. Do you really want to leave?",
+		'actionNoteSave' => "save",
+		'actionNoteCancel' => "cancel",
+		'error' => "Some error occurred (click for details)",
+		'denied' => "Access denied",
+		'invalidpass' => "Wrong password",
+		'addList' => "Create new list",
+		'addListDefault' => "Todo",
+		'renameList' => "Rename list",
+		'deleteList' => "This will delete current list with all tasks in it.\\nAre you sure?",
+		'clearCompleted' => "This will delete all completed tasks in the list.\\nAre you sure?",
+		'settingsSaved' => "Settings saved. Reloading...",
+	);
+
+	private $default_inc = array
+	(
+		'My Tiny Todolist' => "My Tiny Todolist",
+		'htab_newtask' => "New task",
+		'htab_search' => "Search",
+		'btn_add' => "Add",
+		'btn_search' => "Search",
+		'advanced_add' => "Advanced",
+		'searching' => "Searching for",
+		'tasks' => "Tasks",
+		'taskdate_inline_created' => "created at %s",
+		'taskdate_inline_completed' => "Completed at %s",
+		'taskdate_inline_duedate' => "Due %s",
+		'taskdate_created' => "Created",
+		'taskdate_completed' => "Completed",
+		'go_back' => "&lt;&lt; Back",
+		'edit_task' => "Edit Task",
+		'add_task' => "New Task",
+		'priority' => "Priority",
+		'task' => "Task",
+		'note' => "Note",
+		'tags' => "Tags",
+		'save' => "Save",
+		'cancel' => "Cancel",
+		'password' => "Password",
+		'btn_login' => "Login",
+		'a_login' => "Login",
+		'a_logout' => "Logout",
+		'public_tasks' => "Public Tasks",
+		'tagcloud' => "Tags",
+		'tagfilter_cancel' => "cancel filter",
+		'sortByHand' => "Sort by hand",
+		'sortByPriority' => "Sort by priority",
+		'sortByDueDate' => "Sort by due date",
+		'sortByDateCreated' => "Sort by date created",
+		'sortByDateModified' => "Sort by date modified",
+		'due' => "Due",
+		'daysago' => "%d days ago",
+		'indays' => "in %d days",
+		'months_short' => array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"),
+		'months_long' => array("January","February","March","April","May","June","July","August","September","October","November","December"),
+		'days_min' => array("Su","Mo","Tu","We","Th","Fr","Sa"),
+		'days_long' => array("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"),
+		'today' => "today",
+		'yesterday' => "yesterday",
+		'tomorrow' => "tomorrow",
+		'f_past' => "Overdue",
+		'f_today' => "Today and tomorrow",
+		'f_soon' => "Soon",
+		'action_edit' => "Edit",
+		'action_note' => "Edit Note",
+		'action_delete' => "Delete",
+		'action_priority' => "Priority",
+		'action_move' => "Move to",
+		'notes' => "Notes:",
+		'notes_show' => "Show",
+		'notes_hide' => "Hide",
+		'list_new' => "New list",
+		'list_rename' => "Rename list",
+		'list_delete' => "Delete list",
+		'list_publish' => "Publish list",
+		'list_showcompleted' => "Show completed tasks",
+		'list_clearcompleted' => "Clear completed tasks",
+		'list_select' => "Select list",
+		'list_export' => "Export",
+		'list_export_csv' => "CSV",
+		'list_export_ical' => "iCalendar",		
+		'list_rssfeed' => "RSS Feed",
+		'alltags' => "All tags:",
+		'alltags_show' => "Show all",
+		'alltags_hide' => "Hide all",
+		'a_settings' => "Settings",
+		'rss_feed' => "RSS Feed",
+		'feed_title' => "%s",
+		'feed_completed_tasks' => "Completed tasks",
+		'feed_modified_tasks' => "Modified tasks",
+		'feed_new_tasks' => "New tasks",
+		'alltasks' => "All tasks",
+
+		/* Settings */
+		'set_header' => "Settings",
+		'set_title' => "Title",
+		'set_title_descr' => "(specify if you want to change default title)",
+		'set_language' => "Language",
+		'set_protection' => "Password protection",
+		'set_enabled' => "Enabled",
+		'set_disabled' => "Disabled",
+		'set_newpass' => "New password",
+		'set_newpass_descr' => "(leave blank if won't change current password)",
+		'set_smartsyntax' => "Smart syntax",
+		'set_smartsyntax_descr' => "(/priority/ task /tags/)",
+		'set_timezone' => "Time zone",
+		'set_autotag' => "Autotagging",
+		'set_autotag_descr' => "(automatically adds tag of current tag filter to newly created task)",
+		'set_sessions' => "Session handling mechanism",
+		'set_sessions_php' => "PHP",
+		'set_sessions_files' => "Files",
+		'set_firstdayofweek' => "First day of week",
+		'set_custom' => "Custom",
+		'set_date' => "Date format",
+		'set_date2' => "Short Date format",
+		'set_shortdate' => "Short Date (current year)",
+		'set_clock' => "Clock format",
+		'set_12hour' => "12-hour",
+		'set_24hour' => "24-hour",
+		'set_submit' => "Submit changes",
+		'set_cancel' => "Cancel",
+		'set_showdate' => "Show task date in list",
+	);
+
+	var $js = array();
+	var $inc = array();
+
+	function makeJS()
+	{
+		$a = array();
+		foreach($this->default_js as $k=>$v)
+		{
+			if(isset($this->js[$k])) $v = $this->js[$k];
+
+			if(is_array($v)) {
+				$a[] = "$k: ". $v[0];
+			} else {
+				$a[] = "$k: \"". str_replace('"','\\"',$v). "\"";
+			}
+		}
+		$t = array();
+		foreach($this->get('days_min') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
+		$a[] = "daysMin: [". implode(',', $t). "]";
+		$t = array();
+		foreach($this->get('days_long') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
+		$a[] = "daysLong: [". implode(',', $t). "]";
+		$t = array();
+		foreach($this->get('months_long') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
+		$a[] = "monthsLong: [". implode(',', $t). "]";
+		$a[] = $this->_2js('tags');
+		$a[] = $this->_2js('tasks');
+		$a[] = $this->_2js('f_past');
+		$a[] = $this->_2js('f_today');
+		$a[] = $this->_2js('f_soon');
+		return "{\n". implode(",\n", $a). "\n}";
+	}
+
+	function _2js($v)
+	{
+		return "$v: \"". str_replace('"','\\"',$this->get($v)). "\"";
+	}
+
+	function get($key)
+	{
+		if(isset($this->inc[$key])) return $this->inc[$key];
+		if(isset($this->default_inc[$key])) return $this->default_inc[$key];
+		return $key;
+	}
+
+	function rtl()
+	{
+		return $this->rtl ? 1 : 0;
+	}
+
+	public static function instance_deprecated()
+	{
+        if (!isset(self::$instance)) {
+			//$c = __CLASS__;
+			$c = 'Lang';
+			self::$instance = new $c;
+        }
+		return self::$instance;	
+	}
+	
+	public function json($langFile = '', $pretty = 0)
+	{
+		$a = array();
+		
+		if ($langFile != '') {
+			$ah = $this->loadLangHeader($langFile);
+			$a['_header'] = $ah;
+		}
+		
+		if ($this->rtl()) {
+			$a['_rtl'] = $this->rtl();
+		}
+		
+		foreach ( $this->default_inc as $k=>$v ) {
+			if ( isset($this->inc[$k]) ) {
+				$v = $this->inc[$k];
+			}
+			$a[$k] = $v;
+		}
+		
+		foreach ( $this->default_js as $k=>$v ) {
+			if ( isset($this->js[$k]) ) {
+				$v = $this->js[$k];
+			}
+			$v = str_replace("\\n", "\n", $v);
+			$a[$k] = $v;
+		}
+		
+		$encOptions = JSON_UNESCAPED_UNICODE;;
+		if ($pretty) {
+			$encOptions |= JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES;
+		}
+		return json_encode($a, $encOptions);
+	}
+	
+	function loadLangHeader($langFile)
+	{
+		if (!file_exists($langFile)) {
+			die("file does not exist: $langFile");
+		}
+		$contents = file_get_contents($langFile);
+
+		$a = array();
+		
+		# parse head comment
+		if(preg_match("|/\\*\s*myTinyTodo language pack([\s\S]+?)\\*/|", $contents, $m))
+		{
+			$str = $m[1];
+			if(preg_match("|AppVersion\s*:\s*(.+)|i", $str, $m)) {
+				$a['ver'] = trim($m[1]);
+			}
+			if(preg_match("|Date\s*:\s*(.+)|i", $str, $m)) {
+				$a['date'] = trim($m[1]);
+			}
+			if(preg_match("|Language\s*:\s*(.+)|i", $str, $m)) {
+				$a['language'] = trim($m[1]);
+			}
+			if(preg_match("|Original name\s*:\s*(.+)|i", $str, $m)) {
+				$a['original_name'] = trim($m[1]);
+			}
+			if(preg_match("|Author\s*:\s*(.+)|i", $str, $m)) {
+				$a['author'] = trim($m[1]);
+			}
+			if(preg_match("|Author URL\s*:(.+)|i", $str, $m)) {
+				$a['author_url'] = trim($m[1]);
+			}
+			if(preg_match("|Author Email\s*:(.+)|i", $str, $m)) {
+				$a['author_email'] = trim($m[1]);
+			}
+			if(preg_match("|Modified by\s*:(.+)|i", $str, $m)) {
+				$a['modified_by'] = trim($m[1]);
+			}
+		}
+
+		return $a;	
+	}
+}