Reorganizing directory structure.
Abolished helpers.k plus some more structural changes.