Changed structure of folders
Fixed AddString and Initialize