generalne porządki w kodzie

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@210 ff4e3ee1-f430-4e82-ade0-24591c43f1fd

generalne porządki w kodzie
git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@210 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Michał Lenart
1 parent a1d73c9e
Showing 71 changed files with 470 additions and 337 deletions
CMakeLists.txt
README
buildAll.sh
morfeusz/CMakeLists.txt
morfeusz/Environment.cpp
morfeusz/Environment.hpp
morfeusz/InflexionGraph.hpp
morfeusz/InterpretedChunk.hpp
morfeusz/InterpsGroup.hpp
morfeusz/Morfeusz.cpp
morfeusz/Morfeusz.hpp
morfeusz/MorfeuszOptions.hpp
morfeusz/MorfeuszConfig.hpp.in → morfeusz/MorfeuszVersion.hpp.in
morfeusz/MorphDeserializer.cpp
morfeusz/MorphInterpretation.cpp
morfeusz/MorphInterpretation.hpp
morfeusz/Qualifiers.cpp
morfeusz/Qualifiers.hpp
morfeusz/Tagset.cpp
morfeusz/Tagset.hpp
@@ -6,7 +6,7 @@ set (Morfeusz_VERSION_MAJOR 2)
 set (Morfeusz_VERSION_MINOR 0)
 set (Morfeusz_VERSION_PATCH 0)
 set (Morfeusz_VERSION "${Morfeusz_VERSION_MAJOR}.${Morfeusz_VERSION_MINOR}.${Morfeusz_VERSION_PATCH}")
-if (NOT ${VERSION_SUFFIX} STREQUAL "")
+if (VERSION_SUFFIX)
     set (Morfeusz_VERSION_TWEAK "${VERSION_SUFFIX}")
     set (Morfeusz_VERSION "${Morfeusz_VERSION}_${Morfeusz_VERSION_TWEAK}")
 endif ()
@@ -148,13 +148,11 @@ include (CPack)
 file (COPY fsabuilder testfiles input DESTINATION .)
 configure_file (
-  "${PROJECT_SOURCE_DIR}/morfeusz/MorfeuszConfig.hpp.in"
-  "${PROJECT_BINARY_DIR}/morfeusz/MorfeuszConfig.hpp"
+  "${PROJECT_SOURCE_DIR}/morfeusz/MorfeuszVersion.hpp.in"
+  "${PROJECT_BINARY_DIR}/MorfeuszVersion.hpp"
 )
-
-###### add main sources ########
-
 include_directories("${PROJECT_BINARY_DIR}" )
+###### add main sources ########
 add_subdirectory (morfeusz)
 add_subdirectory (fsabuilder)
@@ -109,7 +109,7 @@ Create separate build directory, for example build-darwin.
 Run cross-compilation:
 ----------------------
-cmake -D CROSSMORFEUSZ_ROOT=<path_to_crossmorfeusz_dir> -DCMAKE_TOOLCHAIN_FILE=../morfeusz/Toolchain-xxx.cmake ..
+cmake -D CROSSMORFEUSZ_ROOT=<path_to_crossmorfeusz_dir> -DCMAKE_TOOLCHAIN_FILE=../toolchains/Toolchain-xxx.cmake ..
 make
 make package package-java package-python
@@ -30,12 +30,12 @@ function build {
     srcDir=`pwd`
     buildDir=buildall/$os-$arch
     targetDir=$srcDir/target
-    toolchain=$srcDir/morfeusz/Toolchain-$os-$arch.cmake
+    toolchain=$srcDir/toolchains/Toolchain-$os-$arch.cmake
     echo "Will use $toolchain toolchain"
     rm -rf $buildDir
-    rm -rf $targetDir
+    #~ rm -rf $targetDir
     mkdir -p $buildDir
     mkdir -p $targetDir
     cd $buildDir
@@ -68,7 +68,7 @@ function log {
 export -f build
 export -f log
-rm -rf log
+rm -rf log target
 mkdir -p log
 buildDictionaries 2>&1 | log All all
@@ -79,6 +79,6 @@ buildDictionaries 2&gt;&amp;1 | log All all
     echo "build Windows amd64 package package-java 2>&1 | log Windows amd64"
     echo "build Windows i386 package package-java 2>&1 | log Windows i386"
     echo "build Darwin amd64 package package-java 2>&1 | log Darwin amd64"
-} | xargs -n1 -P8 -d$'\n' bash -c
+} | xargs -n1 -P5 -d$'\n' bash -c
@@ -25,8 +25,6 @@ add_custom_target ( dictionaries DEPENDS analyzer-dictionary generator-dictionar
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-# add_custom_target (dupa DEPENDS "${INPUT_DICTIONARY_CPP}")
-
 #### build #####
 set(SRC_FILES 
@@ -42,37 +40,39 @@ set(SRC_FILES
     InflexionGraph.cpp
     charset/TextReader.cpp
     charset/CharsetConverter.cpp
-    charset/CaseConverter.cpp
-    charset/caseconv.cpp
+    case/CaseConverter.cpp
+    case/caseconv.cpp
     charset/conversion_tables.cpp
     cli/cli.cpp
     segrules/segrules.cpp
     segrules/SegrulesFSA.cpp
-    CasePatternHelper.cpp
-    decoder/InterpretedChunksDecoder.cpp
-    decoder/InterpretedChunksDecoder4Analyzer.cpp
-    decoder/InterpretedChunksDecoder4Generator.cpp
-    deserializer/InterpsGroupsReader.cpp
-    deserializer/MorphDeserializer.cpp
+    case/CasePatternHelper.cpp
+    deserialization/morphInterps/InterpretedChunksDecoder.cpp
+    deserialization/morphInterps/InterpretedChunksDecoder4Analyzer.cpp
+    deserialization/morphInterps/InterpretedChunksDecoder4Generator.cpp
+    deserialization/InterpsGroupsReader.cpp
+    deserialization/MorphDeserializer.cpp
 )
 set(INCLUDE_FILES 
     const.hpp 
     data/default_fsa.hpp
+    Environment.hpp
     Tagset.hpp
     Qualifiers.hpp
     fsa/const.hpp 
     MorphInterpretation.hpp 
     Morfeusz.hpp
+    MorfeuszVersion.hpp
     InflexionGraph.hpp
     charset/CharsetConverter.hpp
     charset/TextReader.hpp
-    charset/CaseConverter.hpp
-    charset/caseconv.hpp
+    case/CaseConverter.hpp
+    case/caseconv.hpp
     charset/conversion_tables.hpp
     cli/cli.hpp
     segrules/segrules.hpp
-    deserializer/MorphDeserializer.cpp
+    deserialization/MorphDeserializer.cpp
 )
 add_library (libmorfeusz SHARED ${SRC_FILES})
@@ -82,24 +82,15 @@ set_target_properties (libmorfeusz PROPERTIES OUTPUT_NAME &quot;morfeusz2&quot;)
 add_executable (morfeusz_analyzer morfeusz_analyzer.cpp)
 add_executable (morfeusz_generator morfeusz_generator.cpp)
-add_executable (test_result_equals test_result_equals.cpp)
-add_executable (test_recognize_dict test_recognize_dict.cpp)
+add_executable (test_result_equals test/test_result_equals.cpp)
+add_executable (test_recognize_dict test/test_recognize_dict.cpp)
 target_link_libraries (morfeusz_analyzer libmorfeusz)
 target_link_libraries (morfeusz_generator libmorfeusz)
 target_link_libraries (test_result_equals libmorfeusz)
 target_link_libraries (test_recognize_dict libmorfeusz)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    target_link_libraries (libmorfeusz ws2_32)
-    set (TARGET_LIB_DIR bin)
-else ()
-    set (TARGET_LIB_DIR lib)
-endif ()
-
-add_subdirectory (java)
-add_subdirectory (python)
-add_subdirectory (perl)
+add_subdirectory (wrappers)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_custom_target (morfeusz-repair-library
@@ -108,6 +99,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES &quot;Darwin&quot;)
     add_dependencies (morfeusz_analyzer morfeusz-repair-library)
 endif ()
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    target_link_libraries (libmorfeusz ws2_32)
+    set (TARGET_LIB_DIR bin)
+else ()
+    set (TARGET_LIB_DIR lib)
+endif ()
+
 install (FILES ${INCLUDE_FILES} DESTINATION include/morfeusz)
 install (TARGETS libmorfeusz DESTINATION ${TARGET_LIB_DIR})
 install (TARGETS morfeusz_analyzer morfeusz_generator DESTINATION bin)
@@ -8,14 +8,11 @@
 #include <vector>
 #include <algorithm>
 #include "Environment.hpp"
-#include "decoder/InterpretedChunksDecoder.hpp"
-#include "deserializer/MorphDeserializer.hpp"
+#include "deserialization/MorphDeserializer.hpp"
 #include "exceptions.hpp"
-#include "decoder/InterpretedChunksDecoder4Analyzer.hpp"
-#include "decoder/InterpretedChunksDecoder4Generator.hpp"
-
-//class InterpretedChunksDecoder4Analyzer;
-//class InterpretedChunksDecoder4Generator;
+#include "deserialization/morphInterps/InterpretedChunksDecoder.hpp"
+#include "deserialization/morphInterps/InterpretedChunksDecoder4Analyzer.hpp"
+#include "deserialization/morphInterps/InterpretedChunksDecoder4Generator.hpp"
 static Deserializer<InterpsGroupsReader>& initializeDeserializer(MorfeuszProcessorType processorType) {
     static Deserializer<InterpsGroupsReader> *analyzerDeserializer
@@ -13,56 +13,142 @@
 class InterpretedChunksDecoder;
 class CasePatternHelper;
-#include "charset/CaseConverter.hpp"
+#include "case/CaseConverter.hpp"
 #include "charset/CharsetConverter.hpp"
 #include "fsa/fsa.hpp"
 #include "segrules/segrules.hpp"
 #include "const.hpp"
 #include "Tagset.hpp"
-//#include "InterpretedChunksDecoder.hpp"
 #include "InterpsGroup.hpp"
-#include "CasePatternHelper.hpp"
+#include "case/CasePatternHelper.hpp"
 #include "Qualifiers.hpp"
-#include "deserializer/InterpsGroupsReader.hpp"
+#include "deserialization/InterpsGroupsReader.hpp"
 struct InterpsGroup;
 typedef FSA<InterpsGroupsReader> FSAType;
-//typedef FSA< std::vector<InterpsGroup > > FSAType;
+/**
+ * This class contains data required for morphological analysis/synthesis.
+ * It contains references to dictionary automaton, charset converter, tagset data etc.
+ * All of these can be changed by setters, changing Morfeusz behavior (different dictionary, charset, and other options).
+ */
 class Environment {
 public:
+    /**
+     * Creates default environment with given initial charset, processor type (analyzer/generator) and default dictionary data ptr.
+     * 
+     * @param charset
+     * @param morfeuszProcessor
+     * @param fileStartPtr
+     */
     Environment(
             MorfeuszCharset charset,
             MorfeuszProcessorType morfeuszProcessor,
             const unsigned char* fileStartPtr);
+    /**
+     * Sets charset for this environment.
+     * 
+     * @param charset
+     */
     void setCharset(MorfeuszCharset charset);
+    /**
+     * Sets case sensitivity options.
+     * 
+     * @param caseSensitive - if true, interpretations not matching case will be discarded.
+     */
     void setCaseSensitive(bool caseSensitive);
+    /**
+     * Gets charset converter that is currently used by this environment.
+     * Changed by setting charset.
+     * 
+     * @return - reference to charset converter.
+     */
     const CharsetConverter& getCharsetConverter() const;
+    /**
+     * Returns case converter that is currently used by this environment.
+     * Changed by setting case sensitivity option.
+     * 
+     * @return - reference to case converter.
+     */
     const CaseConverter& getCaseConverter() const;
+    /**
+     * Sets new tagset for this environment.
+     * 
+     * @param tagset
+     */
     void setTagset(const Tagset& tagset);
+    
+    /**
+     * Gets currently used tagset.
+     * 
+     * @return 
+     */
     const Tagset& getTagset() const;
+    /**
+     * Sets binary dictionary file used by this environment.
+     * 
+     * @param filename - filename of the dictionary
+     */
     void setFSAFile(const std::string& filename);
+    /**
+     * Sets segmentation rules option.
+     * 
+     * @param option
+     * @param value
+     */
     void setSegrulesOption(const std::string& option, const std::string& value);
+    /**
+     * Gets segmentation rules automaton.
+     * 
+     * @return 
+     */
     const SegrulesFSA& getCurrentSegrulesFSA() const;
+    /**
+     * Gets dictionary automaton.
+     * 
+     * @return 
+     */
     const FSAType& getFSA() const;
+    /**
+     * Returns decoder that converts interpretations to external format.
+     * @return 
+     */
     const InterpretedChunksDecoder& getInterpretedChunksDecoder() const;
+    /**
+     * Gets processor type (info if this is analyzer or generator environment)
+     * @return 
+     */
     MorfeuszProcessorType getProcessorType() const;
+    /**
+     * Return current case pattern helper
+     * 
+     * @return 
+     */
     const CasePatternHelper& getCasePatternHelper() const;
+    /**
+     * Return current qualifiers helper.
+     * @return 
+     */
     const Qualifiers& getQualifiersHelper() const;
+    /**
+     * Returns true iff given codepoint denotes a separator char for ign handling.
+     * @param codepoint
+     * @return 
+     */
     bool isSeparator(uint32_t codepoint) const;
     virtual ~Environment();
@@ -13,6 +13,10 @@
 #include <utility>
 #include "InterpretedChunk.hpp"
+/**
+ * This class build inflection graph (indexes the nodes, takes into account segments marked as "weak").
+ * Takes care to make the number of nodes as little as possible.
+ */
 class InflexionGraph {
 public:
@@ -24,30 +28,60 @@ public:
         InterpretedChunk chunk;
         unsigned int nextNode;
     };
-
+    
+    /**
+     * Adds new path to the graph.
+     * 
+     * @param path
+     * @param weak
+     */
     void addPath(const std::vector<InterpretedChunk>& path, bool weak);
     //    void getResults(const Tagset& tagset, const CharsetConverter& charsetConverter, std::vector<MorphInterpretation>& results);
+    /**
+     * Return current graph.
+     * 
+     * @return 
+     */
     const std::vector< std::vector<InflexionGraph::Edge> >& getTheGraph();
+    /**
+     * True iff the graph is empty.
+     * 
+     * @return 
+     */
     bool empty() const;
+    /**
+     * Clears the graph.
+     */
     void clear();
-
-    //    virtual ~FlexionGraph();
 private:
     typedef std::pair<const char*, int> PathElement;
     typedef std::set<PathElement> Path;
+    /**
+     * Adds an edge that starts a chunk.
+     * 
+     * @param e
+     */
     void addStartEdge(const Edge& e);
-
+    
+    /**
+     * Adds non-starting edge.
+     * @param startNode
+     * @param e
+     */
     void addMiddleEdge(unsigned int startNode, const Edge& e);
+    /**
+     * Minimizes the graph so it contains as little number of nodes as possible.
+     */
     void minimizeGraph();
-
+    
     bool canMergeNodes(unsigned int node1, unsigned int node2);
     void doMergeNodes(unsigned int node1, unsigned int node2);
@@ -11,16 +11,59 @@
 #include <vector>
 #include "InterpsGroup.hpp"
+/**
+ * Denotes a part of text that has some not-yet-deserialized interpretations attached to it.
+ */
 struct InterpretedChunk {
+    
+    /**
+     * The type of segment for this chunk.
+     */
     unsigned char segmentType;
+    
+    /**
+     * Pointer to start of this chunks text
+     */
     const char* textStartPtr;
+    
+    /**
+     * Pointer to end of this chunks text (exclusive)
+     */
     const char* textEndPtr;
+    
+    /**
+     * Pointer to the start of this chunks binary data.
+     */
     const unsigned char* interpsGroupPtr;
+    
+    /**
+     * Pointer to the end of this chunks binary data (exclusive)
+     */
     const unsigned char* interpsEndPtr;
+    
+    /**
+     * true iff this chunk shifts orth to the one right to it (it is "A" in "A> B")
+     */
     bool shiftOrth;
+    
+    /**
+     * true iff this chunk has attached data from its prefix chunk (when it is "B" segment in "A> B" segmentation rule)
+     */
     bool orthWasShifted;
+    
+    /**
+     * Number of codepoints this chunks consists of.
+     */
     int codepointsNum;
+    
+    /**
+     * Chunks that are in the prefix segments (those with ">" in segmentation rules, ie. "dig>* dig")
+     */
     std::vector<InterpretedChunk> prefixChunks;
+    
+    /**
+     * Homonym id specified by the user.
+     */
     std::string requiredHomonymId;
 };
@@ -10,6 +10,10 @@
 #include <stdint.h>
+/**
+ * A structure representing one segment
+ * with pointer to its interpretations, case patterns etc.
+ */
 struct InterpsGroup {
     unsigned char type;
     uint16_t size;
@@ -11,15 +11,13 @@
 #include "utils.hpp"
 #include "data/default_fsa.hpp"
 #include "Morfeusz.hpp"
-#include "decoder/InterpretedChunksDecoder.hpp"
+#include "deserialization/morphInterps/InterpretedChunksDecoder.hpp"
 #include "charset/CharsetConverter.hpp"
 #include "charset/charset_utils.hpp"
-#include "charset/CaseConverter.hpp"
+#include "case/CaseConverter.hpp"
 #include "segrules/segrules.hpp"
 #include "const.hpp"
-#include "deserializationUtils.hpp"
 #include "charset/utf8.h"
-#include "compressionByteUtils.hpp"
 // TODO - konstruktor kopiujący działający Tak-Jak-Trzeba
@@ -13,12 +13,11 @@
 #include <vector>
 #include <map>
 #include <set>
-#include "EncodedInterpretation.hpp"
 #include "fsa/fsa.hpp"
 #include "MorphInterpretation.hpp"
 #include "InterpsGroup.hpp"
+#include "case/CaseConverter.hpp"
 #include "charset/CharsetConverter.hpp"
-#include "charset/CaseConverter.hpp"
 #include "charset/TextReader.hpp"
 #include "InterpretedChunk.hpp"
 #include "InflexionGraph.hpp"
@@ -30,8 +29,8 @@
 #include "segrules/segrules.hpp"
 #include "segrules/SegrulesFSA.hpp"
-#include "deserializer/InterpsGroupsReader.hpp"
-#include "deserializer/MorphDeserializer.hpp"
+#include "deserialization/InterpsGroupsReader.hpp"
+#include "deserialization/MorphDeserializer.hpp"
 class Morfeusz;
 class ResultsIterator;
@@ -10,6 +10,9 @@
 #include "const.hpp"
+/**
+ * Represents options for Morfeusz analyzer/generator.
+ */
 struct MorfeuszOptions {
     bool caseSensitive;
     MorfeuszCharset encoding;
@@ -5,6 +5,4 @@
  * Created on November 29, 2013, 10:03 PM
  */
-#define Morfeusz_VERSION_MAJOR @Morfeusz_VERSION_MAJOR@
-#define Morfeusz_VERSION_MINOR @Morfeusz_VERSION_MINOR@
-
+#define MORFEUSZ_VERSION "@Morfeusz_VERSION@"
-/* 
- * File:   MorphDeserializer.cpp
- * Author: mlenart
- * 
- * Created on 12 listopad 2013, 15:31
- */
-
-#include <map>
-#include <algorithm>
-#include "MorphDeserializer.hpp"
-#include "EncodedInterpretation.hpp"
-#include "InterpsGroup.hpp"
-#include "deserializationUtils.hpp"
-
-MorphDeserializer::MorphDeserializer() {
-}
-
-MorphDeserializer::~MorphDeserializer() {
-}
-
-long MorphDeserializer::deserialize(const unsigned char* ptr, vector<InterpsGroup>& interps) const {
-    const unsigned char* currPtr = ptr;
-    uint8_t interpTypesNum = readInt8(currPtr);
-    interps.clear();
-    interps.reserve(interpTypesNum);
-    for (unsigned int i = 0; i < interpTypesNum; i++) {
-        InterpsGroup ig;
-        ig.type = readInt8(currPtr);
-        ig.size = readInt16(currPtr);
-        ig.ptr = currPtr;
-        currPtr += ig.size;
-        interps.push_back(ig);
-    }
-    return currPtr - ptr;
-}
@@ -8,7 +8,6 @@
 #include <string>
 #include <sstream>
 #include "MorphInterpretation.hpp"
-#include "EncodedInterpretation.hpp"
 #include "const.hpp"
 using namespace std;
@@ -32,11 +31,13 @@ tagnum(tagnum),
 namenum(namenum),
 tag(env.getTagset().getTag(tagnum, env.getCharsetConverter())),
 name(env.getTagset().getName(namenum, env.getCharsetConverter())),
-qualifiers(env.getQualifiersHelper().getQualifiers(qualifiersNum)) {
+qualifiers(&env.getQualifiersHelper().getQualifiers(qualifiersNum)) {
 }
+static const vector<std::string> emptyQualifiers;
+
 MorphInterpretation::MorphInterpretation() 
 : startNode(),
 endNode(),
@@ -47,7 +48,7 @@ tagnum(),
 namenum(),
 tag(),
 name(),
-qualifiers(){
+qualifiers(&emptyQualifiers){
 }
@@ -65,7 +66,7 @@ namenum(0),
 //        qualifiersNum(0),
 tag(env.getTagset().getTag(0, env.getCharsetConverter())),
 name(env.getTagset().getName(0, env.getCharsetConverter())),
-qualifiers() {
+qualifiers(&emptyQualifiers) {
 }
@@ -126,7 +127,7 @@ const std::string&amp; MorphInterpretation::getName() const {
 }
 const vector<string>& MorphInterpretation::getQualifiers() const {
-    return this->qualifiers;
+    return *this->qualifiers;
 }
 static inline string getQualifiersStr(const MorphInterpretation& mi) {
@@ -157,7 +158,7 @@ std::string MorphInterpretation::toString(bool includeNodeNumbers) const {
     if (!name.empty()) {
         res << "," << name;
     }
-    if (!qualifiers.empty()) {
+    if (!qualifiers->empty()) {
         res << "," << getQualifiersStr(*this);
     }
     return res.str();
@@ -13,10 +13,12 @@
 class Environment;
 #include "Tagset.hpp"
-#include "EncodedInterpretation.hpp"
 #include "charset/CharsetConverter.hpp"
 #include "Environment.hpp"
+/**
+ * Morphological interpretation as seen by the user in the analysis/generation results.
+ */
 class MorphInterpretation {
 public:
     MorphInterpretation(
@@ -59,7 +61,7 @@ private:
     int namenum;
     std::string tag;
     std::string name;
-    std::vector<std::string> qualifiers;
+    const std::vector<std::string>* qualifiers;
 };
 #endif	/* MORPHINTERPRETATION_HPP */
@@ -7,7 +7,7 @@
 #include <iostream>
 #include "Qualifiers.hpp"
-#include "deserializationUtils.hpp"
+#include "deserialization/deserializationUtils.hpp"
 #include "fsa/const.hpp"
 using namespace std;
@@ -32,13 +32,9 @@ qualifiers() {
     }
 }
-vector<string> Qualifiers::getQualifiers(int n) const {
+const vector<string>& Qualifiers::getQualifiers(int n) const {
     return this->qualifiers.at(n);
 }
-unsigned int Qualifiers::getQualifiersNum() const {
-    return (unsigned int) this->qualifiers.size();
-}
-
 Qualifiers::~Qualifiers() {
 }
@@ -12,11 +12,21 @@
 #include <string>
 #include <stdint.h>
+/**
+ * Helper class used for decoding qualifiers set number into a vector of strings.
+ * 
+ * @param ptr
+ */
 class Qualifiers {
 public:
     explicit Qualifiers(const unsigned char* ptr);
-    std::vector<std::string> getQualifiers(int n) const;
-    unsigned int getQualifiersNum() const;
+    
+    /**
+     * Returns vector of qualifiers represented as strings.
+     * @param n - the index in qualifiers tab.
+     * @return - vector of qualifiers represented as strings.
+     */
+    const std::vector<std::string>& getQualifiers(int n) const;
     virtual ~Qualifiers();
 private:
     std::vector< std::vector<std::string> > qualifiers;
@@ -3,8 +3,7 @@
 #include "Tagset.hpp"
 #include "fsa/const.hpp"
 #include "utils.hpp"
-#include "endianness.hpp"
-#include "deserializationUtils.hpp"
+#include "deserialization/deserializationUtils.hpp"
 using namespace std;
@@ -12,11 +12,34 @@
 #include <vector>
 #include "charset/CharsetConverter.hpp"
+/**
+ * Represents a tagset
+ */
 class Tagset {
 public:
+    /**
+     * Constructs a tagset from binary data.
+     * 
+     * @param fsaData - pointer to the beginning of automaton data.
+     */
     explicit Tagset(const unsigned char* fsaData);
-//    Tagset(const Tagset& tagset);
+    
+    /**
+     * Returns tag (denoted by its index) as a string.
+     * 
+     * @param tagNum - tag index in the tagset.
+     * @param charsetConverter - the charset converter used to convert from tagset internal encoding (UTF-8) into target encoding.
+     * @return - the tag encoded as string.
+     */
     const std::string getTag(const int tagNum, const CharsetConverter& charsetConverter) const;
+    
+    /**
+     * Returns named entity type (denoted by its index) as a string.
+     * 
+     * @param nameNum - name index in the tagset.
+     * @param charsetConverter - the charset converter used to convert from tagset internal encoding (UTF-8) into target encoding.
+     * @return - the named entity type encoded as string.
+     */
     const std::string getName(const int nameNum, const CharsetConverter& charsetConverter) const;
 private:
     std::vector<std::string> tags;
@@ -10,12 +10,15 @@
 #include <vector>
 #include "InterpsGroup.hpp"
-#include "CasePatternHelper.hpp"
-#include "compressionByteUtils.hpp"
+#include "deserialization/morphInterps/compressionByteUtils.hpp"
 #include "Environment.hpp"
 class Environment;
+/**
+ * Utility class used to for case-sensitive interpretations filtering
+ * (ie. to filter out "berlin" and keep "Berlin")
+ */
 class CasePatternHelper {
 public:
@@ -23,10 +26,23 @@ public:
     }
+    /**
+     * Set if this case pattern helper cares about case-sensitivity
+     * 
+     * @param caseSensitive
+     */
     void setCaseSensitive(bool caseSensitive) {
         this->caseSensitive = caseSensitive;
     }
-
+    
+    /**
+     * Check if given word matches given case pattern
+     * 
+     * @param lowercaseCodepoints - codepoints of checked word converter to lowercase
+     * @param originalCodepoints - codepoints of checked word
+     * @param casePattern - vector representing case pattern ( ie. [False, True] for "mBank")
+     * @return - true iff word denoted by given codepoints matches given case pattern
+     */
     bool checkCasePattern(
             const std::vector<uint32_t>& lowercaseCodepoints,
             const std::vector<uint32_t>& originalCodepoints,
@@ -41,12 +57,28 @@ public:
         return true;
     }
+    /**
+     * Check if given word has a chance of matching any of case patterns in given interps group.
+     * 
+     * @param env - environment
+     * @param orthStart - pointer to start of word
+     * @param orthEnd - pointer to end of word
+     * @param ig - interps group
+     * @return - true iff word encoded from orthStart to orthEnd 
+     *          matches at least one of the interp group's morph interpretation's case pattern.
+     */
     bool checkInterpsGroupOrthCasePatterns(
             const Environment& env,
             const char* orthStart,
             const char* orthEnd,
             const InterpsGroup& ig) const;
+    /**
+     * Deserializes case pattern encoded at given pointer.
+     * 
+     * @param ptr
+     * @return - case pattern
+     */
     static std::vector<bool> deserializeOneCasePattern(const unsigned char*& ptr);
 private:
     bool caseSensitive;
@@ -8,6 +8,10 @@
 #ifndef CASECONV_HPP
 #define	CASECONV_HPP
+/*
+ * Case conversion tables
+ */
+
 extern const unsigned int TO_LOWERCASE_TABLE_SIZE;
 extern const unsigned int EXT_TO_LOWERCASE_TABLE_SIZE;
 extern const uint32_t TO_LOWERCASE_TABLE[];
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <inttypes.h>
 #include <iostream>
-#include "../endianness.hpp"
+#include "deserialization/endianness.hpp"
 #include "utf8.h"
 #include "CharsetConverter.hpp"
 #include "conversion_tables.hpp"
@@ -8,7 +8,7 @@
 #ifndef TEXTREADER_HPP
 #define	TEXTREADER_HPP
-#include "../Environment.hpp"
+#include "Environment.hpp"
 class TextReader {
 public:
@@ -6,7 +6,7 @@
  */
 #include "InterpsGroupsReader.hpp"
-#include "../deserializationUtils.hpp"
+#include "deserialization/deserializationUtils.hpp"
 InterpsGroupsReader::InterpsGroupsReader()
 : currPtr(NULL), endPtr(NULL) {
@@ -6,7 +6,7 @@
  */
 #include "MorphDeserializer.hpp"
-#include "../deserializationUtils.hpp"
+#include "deserialization/deserializationUtils.hpp"
 MorphDeserializer::MorphDeserializer() {
 }
@@ -16,11 +16,10 @@
 #include "EncodedInterpretation.hpp"
 #include "InterpretedChunk.hpp"
 #include "EncodedInterpretation.hpp"
-#include "charset/CaseConverter.hpp"
+#include "case/CaseConverter.hpp"
 #include "Environment.hpp"
 #include "MorphInterpretation.hpp"
-#include "CasePatternHelper.hpp"
-#include "deserializationUtils.hpp"
+#include "case/CasePatternHelper.hpp"
 #include "compressionByteUtils.hpp"
 #include "const.hpp"
@@ -12,7 +12,7 @@
 #include <climits>
 #include "fsa.hpp"
-#include "../deserializationUtils.hpp"
+#include "../deserialization/deserializationUtils.hpp"
 static const unsigned char CFSA1_ACCEPTING_FLAG = 128;
 //static const unsigned char CFSA1_ARRAY_FLAG = 64;
@@ -13,7 +13,7 @@
 #include <iostream>
 #include "fsa.hpp"
 #include "../utils.hpp"
-#include "../endianness.hpp"
+#include "../deserialization/endianness.hpp"
 static const unsigned char HAS_REMAINING_FLAG = 128;
 static const unsigned char ACCEPTING_FLAG = 64;
@@ -17,7 +17,7 @@
 #include <sstream>
 #include "const.hpp"
 #include "../utils.hpp"
-#include "../endianness.hpp"
+#include "../deserialization/endianness.hpp"
 //using namespace std;
 //static const unsigned int FSA_OFFSET = 6;
-
-# SWIG
-#set(CMAKE_SWIG_OUTDIR swig)
-#FIND_PACKAGE(SWIG REQUIRED)
-FIND_PACKAGE(JNI REQUIRED)
-#INCLUDE(${SWIG_USE_FILE})
-include(UseJava)
-
-# SWIG Java
-include_directories (${JAVA_INCLUDE_PATH})
-include_directories (..)
-
-set (SWIG_JAVA_OUTFILE swigJAVA.cpp)
-# set (JAVA_WRAPPER_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}morfeusz${CMAKE_SHARED_LIBRARY_SUFFIX})
-add_custom_command ( 
-    OUTPUT ${SWIG_JAVA_OUTFILE}
-    COMMAND swig -java -c++ -package pl.waw.ipipan.morfeusz  -o ${SWIG_JAVA_OUTFILE} -outdir ${CMAKE_SOURCE_DIR}/jmorfeusz/src/main/java/pl/waw/ipipan/morfeusz ${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i
-    DEPENDS libmorfeusz
-)
-#set (CMAKE_SHARED_LINKER_FLAGS "-s -Os -static-libstdc++ -static-libgcc")
-add_library (jmorfeusz SHARED ${SWIG_JAVA_OUTFILE})
-target_link_libraries (jmorfeusz ${JAVA_LIBRARIES} libmorfeusz)
-add_dependencies (jmorfeusz ${SWIG_JAVA_OUTFILE})
-
-#set (CMAKE_SWIG_FLAGS -package pl.waw.ipipan.morfeusz)
-#set (CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR}/jmorfeusz/src/main/java/pl/waw/ipipan/morfeusz) 
-
-#set_source_files_properties (../morfeusz.i PROPERTIES CPLUSPLUS ON)
-#SWIG_ADD_MODULE(jmorfeusz java ../morfeusz.i)
-#SWIG_LINK_LIBRARIES(jmorfeusz ${JAVA_LIBRARIES})
-#SWIG_LINK_LIBRARIES(jmorfeusz libmorfeusz)
-
-#if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-#    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-#    set (CMAKE_SHARED_LINKER_FLAGS "-s -Os -static-libstdc++ -static-libgcc")
-#endif ()
@@ -12,14 +12,16 @@
 #include "fsa/fsa.hpp"
 #include "Tagset.hpp"
 #include "Morfeusz.hpp"
+#include "MorfeuszVersion.hpp"
 #include "const.hpp"
 #include "cli/cli.hpp"
-#include "outputUtils.hpp"
+#include "cli/outputUtils.hpp"
 using namespace std;
 int main(int argc, const char** argv) {
+    cerr << "Morfeusz analyzer, version: " << MORFEUSZ_VERSION << endl;
     ez::ezOptionParser& opt = *getOptions(argc, argv, ANALYZER);
     Morfeusz morfeusz;
     initializeMorfeusz(opt, morfeusz);
@@ -11,13 +11,15 @@
 #include "fsa/fsa.hpp"
 #include "Tagset.hpp"
 #include "Morfeusz.hpp"
+#include "MorfeuszVersion.hpp"
 #include "const.hpp"
 #include "cli/cli.hpp"
-#include "outputUtils.hpp"
+#include "cli/outputUtils.hpp"
 using namespace std;
 int main(int argc, const char** argv) {
+    cerr << "Morfeusz generator, version: " << MORFEUSZ_VERSION << endl;
     ez::ezOptionParser& opt = *getOptions(argc, argv, GENERATOR);
     Morfeusz morfeusz;
     initializeMorfeusz(opt, morfeusz);
@@ -10,7 +10,7 @@
 #include <set>
 #include <iostream>
-#include "../deserializationUtils.hpp"
+#include "../deserialization/deserializationUtils.hpp"
 struct SegrulesState {
     uint16_t offset;
 #include "segrules.hpp"
-#include "../fsa/fsa.hpp"
-#include "../fsa/const.hpp"
-#include "../deserializationUtils.hpp"
+#include "fsa/fsa.hpp"
+#include "fsa/const.hpp"
+#include "deserialization/deserializationUtils.hpp"
 using namespace std;
@@ -8,7 +8,6 @@
 //#include <cstdlib>
 #include <sstream>
 #include <iostream>
-#include "EncodedInterpretation.hpp"
 #include "utils.hpp"
 #include "Morfeusz.hpp"
 #include "MorphInterpretation.hpp"
-/* 
- * File:   test_synth_dict.cpp
- * Author: mlenart
- *
- * Created on 21 styczeń 2014, 12:00
- */
-
-#include <cstdlib>
-
-using namespace std;
-
-/*
- * 
- */
-int main(int argc, char** argv) {
-
-    return 0;
-}
-
+add_subdirectory (java)
+add_subdirectory (python)
+add_subdirectory (perl)
 \ No newline at end of file
@@ -6,14 +6,14 @@ find_package(Java REQUIRED)
 include_directories (${JAVA_INCLUDE_PATH})
 include_directories (${JAVA_INCLUDE_PATH2})
-include_directories (..)
+include_directories (${CMAKE_SOURCE_DIR}/morfeusz)
 set (SWIG_JAVA_OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/swigJAVA.cpp")
 file (COPY pl DESTINATION .)
 set (JAVA_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/pl/waw/ipipan/morfeusz")
 add_custom_command (
     OUTPUT ${SWIG_JAVA_OUTFILE}
-    COMMAND swig -java -c++ -package pl.waw.ipipan.morfeusz  -o ${SWIG_JAVA_OUTFILE} -outdir ${JAVA_SRC_DIR} ${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i
+    COMMAND swig -java -c++ -package pl.waw.ipipan.morfeusz  -o ${SWIG_JAVA_OUTFILE} -outdir ${JAVA_SRC_DIR} ${CMAKE_SOURCE_DIR}/morfeusz/wrappers/morfeusz.i
     DEPENDS libmorfeusz
 )
 add_custom_target(generate_java_wrapper ALL
@@ -91,10 +91,10 @@ import java.io.IOException;
 %ignore Tagset::Tagset(const unsigned char* fsaData);
-%include "Morfeusz.hpp"
-%include "MorphInterpretation.hpp"
-%include "const.hpp"
-%include "exceptions.hpp"
+%include "../Morfeusz.hpp"
+%include "../MorphInterpretation.hpp"
+%include "../const.hpp"
+%include "../exceptions.hpp"
 // instantiate vector of interpretations
 namespace std {
@@ -6,7 +6,7 @@ if (NOT CMAKE_CROSSCOMPILING)
     find_package (PerlLibs REQUIRED)
     include_directories (${PERL_INCLUDE_PATH})
-    include_directories (..)
+    include_directories (../..)
     set (CMAKE_SWIG_FLAGS "")
@@ -9,14 +9,14 @@ set (PYMORFEUSZ_VERSION &quot;0.1.0&quot;)
 # SWIG Java
 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (..)
+INCLUDE_DIRECTORIES (../..)
 set (SWIG_PYTHON_OUTFILE_CXX "${CMAKE_CURRENT_BINARY_DIR}/swigPYTHON.cpp")
 set (SWIG_PYTHON_OUTFILE_PY "${CMAKE_CURRENT_BINARY_DIR}/morfeusz2.py")
 add_custom_command ( 
     OUTPUT "${SWIG_PYTHON_OUTFILE_CXX}" "${SWIG_PYTHON_OUTFILE_PY}"
-    COMMAND swig -python -c++ -o "${SWIG_PYTHON_OUTFILE_CXX}" "${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i"
+    COMMAND swig -python -c++ -o "${SWIG_PYTHON_OUTFILE_CXX}" "${CMAKE_SOURCE_DIR}/morfeusz/wrappers/morfeusz.i"
     DEPENDS libmorfeusz
 )
 add_custom_target (generate_python_wrapper
@@ -5,6 +5,14 @@
                    displayName="build"
                    projectFiles="true"
                    root="build">
+      <logicalFolder name="morfeusz" displayName="morfeusz" projectFiles="true">
+        <logicalFolder name="wrappers" displayName="wrappers" projectFiles="true">
+          <logicalFolder name="java" displayName="java" projectFiles="true">
+            <itemPath>build/morfeusz/wrappers/java/swigJAVA.cpp</itemPath>
+          </logicalFolder>
+          <itemPath>build/morfeusz/wrappers/morfeuszPERL_wrap.cxx</itemPath>
+        </logicalFolder>
+      </logicalFolder>
       <itemPath>build/default_fsa.cpp</itemPath>
       <itemPath>build/default_synth_fsa.cpp</itemPath>
     </logicalFolder>
@@ -17,22 +25,25 @@
       <itemPath>build1/morfeusz/java/swigJAVA.cpp</itemPath>
     </logicalFolder>
     <df root="morfeusz" name="0">
-      <df name="charset">
+      <df name="case">
         <in>CaseConverter.cpp</in>
+        <in>CasePatternHelper.cpp</in>
+        <in>caseconv.cpp</in>
+      </df>
+      <df name="charset">
         <in>CharsetConverter.cpp</in>
         <in>TextReader.cpp</in>
-        <in>caseconv.cpp</in>
         <in>conversion_tables.cpp</in>
       </df>
       <df name="cli">
         <in>cli.cpp</in>
       </df>
-      <df name="decoder">
-        <in>InterpretedChunksDecoder.cpp</in>
-        <in>InterpretedChunksDecoder4Analyzer.cpp</in>
-        <in>InterpretedChunksDecoder4Generator.cpp</in>
-      </df>
-      <df name="deserializer">
+      <df name="deserialization">
+        <df name="morphInterps">
+          <in>InterpretedChunksDecoder.cpp</in>
+          <in>InterpretedChunksDecoder4Analyzer.cpp</in>
+          <in>InterpretedChunksDecoder4Generator.cpp</in>
+        </df>
         <in>InterpsGroupsReader.cpp</in>
         <in>MorphDeserializer.cpp</in>
       </df>
@@ -46,20 +57,19 @@
         <in>SegrulesFSA.cpp</in>
         <in>segrules.cpp</in>
       </df>
-      <in>CasePatternHelper.cpp</in>
+      <df name="test">
+        <in>test_recognize_dict.cpp</in>
+        <in>test_result_equals.cpp</in>
+      </df>
       <in>Environment.cpp</in>
       <in>InflexionGraph.cpp</in>
       <in>Morfeusz.cpp</in>
-      <in>MorphDeserializer.cpp</in>
       <in>MorphInterpretation.cpp</in>
       <in>Qualifiers.cpp</in>
       <in>Tagset.cpp</in>
       <in>const.cpp</in>
-      <in>main.cpp</in>
       <in>morfeusz_analyzer.cpp</in>
       <in>morfeusz_generator.cpp</in>
-      <in>test_recognize_dict.cpp</in>
-      <in>test_result_equals.cpp</in>
     </df>
     <logicalFolder name="morfeusz"
                    displayName="morfeusz"
@@ -101,10 +111,9 @@
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
       <flagsDictionary>
-        <element flagsID="0" commonFlags="-O2 -std=c++98"/>
-        <element flagsID="1" commonFlags="-O2 -std=c++98 -fPIC"/>
-        <element flagsID="2" commonFlags="-std=c++98 -O3"/>
-        <element flagsID="3" commonFlags="-std=c++98 -O3 -fPIC"/>
+        <element flagsID="0" commonFlags="-std=c++98 -O3"/>
+        <element flagsID="1" commonFlags="-std=c++98 -O3 -fPIC"/>
+        <element flagsID="2" commonFlags="3"/>
       </flagsDictionary>
       <codeAssistance>
       </codeAssistance>
@@ -114,18 +123,49 @@
           <buildCommand>${MAKE} -f Makefile</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/morfeusz/morfeusz_analyzer</executablePath>
+          <ccTool flags="1">
+            <incDir>
+              <pElem>build</pElem>
+              <pElem>morfeusz</pElem>
+            </incDir>
+            <preprocessorList>
+              <Elem>NDEBUG</Elem>
+            </preprocessorList>
+          </ccTool>
         </makeTool>
       </makefileType>
       <item path="build/default_fsa.cpp" ex="false" tool="1" flavor2="4">
+        <ccTool>
+          <incDir>
+            <pElem>build/morfeusz</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__pic__=2</Elem>
+            <Elem>libmorfeusz_EXPORTS</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>
+          </undefinedList>
+        </ccTool>
       </item>
       <item path="build/default_synth_fsa.cpp" ex="false" tool="1" flavor2="4">
+        <ccTool>
+          <incDir>
+            <pElem>build/morfeusz</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__pic__=2</Elem>
+            <Elem>libmorfeusz_EXPORTS</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>
+          </undefinedList>
+        </ccTool>
       </item>
       <item path="build/morfeusz/default_fsa.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
-          <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
-          </incDir>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
@@ -136,17 +176,13 @@
             tool="1"
             flavor2="4">
         <ccTool flags="1">
-          <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
-          </incDir>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
       </item>
       <item path="build/morfeusz/java/swigJAVA.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="3">
+        <ccTool flags="1">
         </ccTool>
       </item>
       <item path="build/morfeusz/morfeuszJAVA_wrap.cxx"
@@ -155,14 +191,11 @@
             flavor2="8">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
             <pElem>/usr/lib/jvm/default-java/include</pElem>
             <pElem>build/morfeusz/java</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>_OPTIMIZE__=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__pic__=2</Elem>
@@ -181,8 +214,6 @@
             flavor2="4">
         <ccTool flags="1">
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>/usr/lib/perl/5.14/CORE</pElem>
             <pElem>build/morfeusz/perl</pElem>
           </incDir>
@@ -197,14 +228,11 @@
             flavor2="8">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
             <pElem>/usr/include/python2.7</pElem>
             <pElem>build/morfeusz/python</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>_OPTIMIZE__=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__pic__=2</Elem>
@@ -218,22 +246,40 @@
         </ccTool>
       </item>
       <item path="build/morfeusz/python/swigPYTHON.cpp"
+            ex="true"
+            tool="3"
+            flavor2="4">
+      </item>
+      <item path="build/morfeusz/wrappers/java/swigJAVA.cpp"
             ex="false"
             tool="1"
             flavor2="4">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="build/morfeusz/wrappers/morfeuszPERL_wrap.cxx"
+            ex="false"
+            tool="1"
+            flavor2="4">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>/usr/lib/perl/5.14/CORE</pElem>
+            <pElem>build/morfeusz/wrappers/perl</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>morfeusz_perl_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
       <item path="build1/morfeusz/java/swigJAVA.cpp" ex="false" tool="1" flavor2="4">
       </item>
       <item path="default_fsa.cpp" ex="false" tool="1" flavor2="4">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
             <pElem>morfeusz/build/morfeusz</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
@@ -241,13 +287,10 @@
       <item path="default_synth_fsa.cpp" ex="false" tool="1" flavor2="4">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
             <pElem>morfeusz/build/morfeusz</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
@@ -255,34 +298,32 @@
       <folder path="0">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/charset">
+      <folder path="0/case">
         <ccTool>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="0/cli">
+      <folder path="0/charset">
         <ccTool>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="0/decoder">
+      <folder path="0/cli">
         <ccTool>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="0/deserializer">
+      <folder path="0/deserialization">
         <ccTool>
           <preprocessorList>
             <Elem>libmorfeusz_EXPORTS</Elem>
@@ -303,35 +344,24 @@
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="build">
+      <folder path="build/morfeusz/wrappers/java">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
-            <pElem>build/morfeusz</pElem>
+            <pElem>/usr/lib/jvm/default-java/include</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__pic__=2</Elem>
-            <Elem>libmorfeusz_EXPORTS</Elem>
+            <Elem>libjmorfeusz_EXPORTS</Elem>
           </preprocessorList>
-          <undefinedList>
-            <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>
-          </undefinedList>
         </ccTool>
       </folder>
       <folder path="java">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
             <pElem>build/morfeusz</pElem>
             <pElem>build1</pElem>
             <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>libjmorfeusz_EXPORTS</Elem>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
@@ -340,12 +370,9 @@
       <folder path="morfeusz/java">
         <ccTool>
           <incDir>
-            <pElem>build</pElem>
-            <pElem>morfeusz</pElem>
-            <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem>
+            <pElem>/usr/lib/jvm/default-java/include</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>libjmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
@@ -353,21 +380,10 @@
       <folder path="morfeusz/python">
         <ccTool>
           <incDir>
-            <pElem>morfeusz</pElem>
             <pElem>/usr/include/python2.7</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
         </ccTool>
       </folder>
-      <item path="morfeusz/CasePatternHelper.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="1">
-          <preprocessorList>
-            <Elem>libmorfeusz_EXPORTS</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
       <item path="morfeusz/Environment.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
           <preprocessorList>
@@ -383,17 +399,8 @@
         </ccTool>
       </item>
       <item path="morfeusz/Morfeusz.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="3">
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-            <Elem>libmorfeusz_EXPORTS</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="morfeusz/MorphDeserializer.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="3">
+        <ccTool flags="2">
           <preprocessorList>
-            <Elem>NDEBUG</Elem>
             <Elem>libmorfeusz_EXPORTS</Elem>
           </preprocessorList>
         </ccTool>
@@ -419,36 +426,36 @@
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="morfeusz/charset/CaseConverter.cpp" ex="false" tool="1" flavor2="4">
+      <item path="morfeusz/case/CaseConverter.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
         </ccTool>
       </item>
-      <item path="morfeusz/charset/CharsetConverter.cpp"
+      <item path="morfeusz/case/CasePatternHelper.cpp"
             ex="false"
             tool="1"
             flavor2="4">
-        <ccTool flags="3">
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="morfeusz/charset/TextReader.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
         </ccTool>
       </item>
-      <item path="morfeusz/charset/caseconv.cpp" ex="false" tool="1" flavor2="4">
+      <item path="morfeusz/case/caseconv.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
         </ccTool>
       </item>
+      <item path="morfeusz/charset/CharsetConverter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+      </item>
+      <item path="morfeusz/charset/TextReader.cpp" ex="false" tool="1" flavor2="4">
+      </item>
       <item path="morfeusz/charset/conversion_tables.cpp"
             ex="false"
             tool="1"
             flavor2="4">
-        <ccTool flags="1">
-        </ccTool>
       </item>
       <item path="morfeusz/cli/cli.cpp" ex="false" tool="1" flavor2="4">
+        <ccTool flags="1">
+        </ccTool>
       </item>
       <item path="morfeusz/const.cpp" ex="false" tool="1" flavor2="4">
         <ccTool flags="1">
@@ -457,29 +464,31 @@
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="morfeusz/decoder/InterpretedChunksDecoder.cpp"
+      <item path="morfeusz/deserialization/InterpsGroupsReader.cpp"
             ex="false"
             tool="1"
             flavor2="4">
       </item>
-      <item path="morfeusz/decoder/InterpretedChunksDecoder4Analyzer.cpp"
+      <item path="morfeusz/deserialization/MorphDeserializer.cpp"
             ex="false"
             tool="1"
             flavor2="4">
       </item>
-      <item path="morfeusz/decoder/InterpretedChunksDecoder4Generator.cpp"
+      <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder.cpp"
             ex="false"
             tool="1"
             flavor2="4">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="morfeusz/deserializer/InterpsGroupsReader.cpp"
+      <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Analyzer.cpp"
             ex="false"
             tool="1"
             flavor2="4">
         <ccTool flags="1">
         </ccTool>
       </item>
-      <item path="morfeusz/deserializer/MorphDeserializer.cpp"
+      <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Generator.cpp"
             ex="false"
             tool="1"
             flavor2="4">
@@ -496,9 +505,6 @@
           <incDir>
             <pElem>build/fsa</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
         </ccTool>
       </item>
       <item path="morfeusz/fsa/test_recognize.cpp" ex="false" tool="1" flavor2="8">
@@ -506,9 +512,6 @@
           <incDir>
             <pElem>build/fsa</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
         </ccTool>
       </item>
       <item path="morfeusz/fsa/test_speed.cpp" ex="false" tool="1" flavor2="8">
@@ -516,43 +519,33 @@
           <incDir>
             <pElem>build/fsa</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="morfeusz/main.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool>
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-            <Elem>_OPTIMIZE__=1</Elem>
-            <Elem>libmorfeusz_EXPORTS</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>__NO_INLINE__</Elem>
-          </undefinedList>
         </ccTool>
       </item>
       <item path="morfeusz/morfeusz_analyzer.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="2">
-          <preprocessorList>
-            <Elem>NDEBUG</Elem>
-          </preprocessorList>
+        <ccTool flags="0">
         </ccTool>
       </item>
       <item path="morfeusz/morfeusz_generator.cpp" ex="false" tool="1" flavor2="4">
+        <ccTool flags="0">
+        </ccTool>
       </item>
       <item path="morfeusz/segrules/SegrulesFSA.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="1">
-        </ccTool>
       </item>
       <item path="morfeusz/segrules/segrules.cpp" ex="false" tool="1" flavor2="4">
-        <ccTool flags="1">
-        </ccTool>
       </item>
-      <item path="morfeusz/test_recognize_dict.cpp" ex="false" tool="1" flavor2="4">
+      <item path="morfeusz/test/test_recognize_dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+        <ccTool flags="0">
+        </ccTool>
       </item>
-      <item path="morfeusz/test_result_equals.cpp" ex="false" tool="1" flavor2="4">
+      <item path="morfeusz/test/test_result_equals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+        <ccTool flags="0">
+        </ccTool>
       </item>
     </conf>
   </confs>
@@ -4,9 +4,9 @@ rm -rf profbuild
 mkdir -p profbuild
 cd profbuild
 cmake -D INPUT_DICTIONARIES=../input/dodatki.tab,../input/PoliMorfSmall.tab -D CMAKE_BUILD_TYPE=Debug -D CMAKE_CXX_FLAGS="-g -O2" -D CMAKE_SHARED_LINKER_FLAGS="-lprofiler" -D CMAKE_EXE_LINKER_FLAGS="-lprofiler" ..
-make -j4
+make
 rm -f /tmp/morfeusz.prof
 export LD_PRELOAD="/usr/lib/libprofiler.so"
 export CPUPROFILE="/tmp/morfeusz.prof"
-morfeusz/morfeusz_analyzer -i /tmp/dupadupa < /mnt/storage/morfeusz/sents30k > /dev/null
+morfeusz/morfeusz_analyzer -i /home/wkieras/output/sgjp_analyzer.fsa < /mnt/storage/morfeusz/sents10k > /dev/null
 ### pprof --gv profbuild/morfeusz/morfeusz_analyzer /tmp/morfeusz.prof