An26. Refactor

added An26. Refactor of program architecture. Same types for processing
at all modules.