[enh] improved readability
[enh] reorganized directories and files
[enh] updated servers list