Project infrsstructure improved. Added task #2