1.1.1 fixes and initial modules work

1. Added v1.1.1 fixes.
2. Initial work on splitting plugin into self-sufficient modules (in
language file and functions).