Updated API so that it should work, also updated helper db files to new db and moved them