FIX. Moving files to external library.
Merge pull request #223 from SlavaRa/CodeRefactor-improvements-2

FIX. Moving files to external library.