Restructure cumpute db code
Merge pull request #193 from erwinwinder/master

Restructure cumpute db code