--- a/sources/cabal.cpp	Sun Jan 20 19:32:59 2008 +0300
+++ b/sources/cabal.cpp	Mon Jan 21 01:14:10 2008 +0300
@@ -3,7 +3,7 @@
  *
  * -- CABAL -- primary module
  *
- * Copyright (c) 2007 Vlad Glagolev <enqlave@gmail.com>
+ * Copyright (c) 2007-2008 Vlad Glagolev <enqlave@gmail.com>
  * All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -19,7 +19,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "cabal.h"
+#include "cabal.hpp"
 
 Core *CABAL;
 
@@ -37,32 +37,37 @@
 	exit(0);
 }
 
-int main(int argc, char *argv[])
+void showHelp()
+{
+	cout
+		<< "\nUsage:\n" \
+		<< "\t-d, --daemon		| daemon mode\n" \
+		<< "\t-c, --config <file>	| configuration file\n" \
+		<< "\t-h, --help		| this message\n" \
+		<< "\nCopyright (c) 2007-2008 Vlad Glagolev (BSD license)\n" << endl;
+
+	exit(0);
+}
+
+int main(int argc, char **argv)
 {
 	cout
 		<< "-- CABAL -- " << VERSION << " (CORE: " << VERSION_CORE ") | " \
 		<< "Compiled: " << __DATE__ << " at " << __TIME__ << endl;
 
-	if (argc < 2) {
-		cout
-			<< "\nUsage:\n" \
-			<< "\t-d, --daemon		| daemon mode\n" \
-			<< "\t-c, --config <file>	| configuration file\n" \
-			<< "\nCopyright (c) 2007 Vlad Glagolev (under the BSD license)\n";
-
-		exit(0);
-	}
+	if (argc < 2)
+		showHelp();
 
 	CABAL = new Core();
 
-	CABAL->commandParse(argc, argv);
-	CABAL->configParse();
-	CABAL->pidCheck();
+	CABAL->parseCommandLine(argc, argv);
+	CABAL->parseConfig();
+	CABAL->checkPID();
 
 	if (!CABAL->debug)
 		daemonize();
 
-	CABAL->pidWrite();
+	CABAL->writePID();
 
 	CABAL->work();