some fixes
Restructure