Revert "collapsing categories, bugfixes"

This reverts commit 42ad39939cf5ddf52833a9b822425b347ca2dba7.
reapplying bugfixes after revert

- nanosleep problem in gcc-4.7
- bug in encryptorDecryptor
- estreamProject polishing
- bug in HammingWeightEvaluator
commit for master (commit id separation)