Fixed some imports in gbase
Ordered sections map in folders