Revert "rebuilding new structure"

This reverts commit 307c4d8d2a914f1c478606cf2add037a810f8bb3.