ST database changed

Restructure of the databases to make system more effective