Adding module 2.
New structure (author:vladimir.bystritskiy)