fully reformed structur, added symbol-table