restructure db files, make sure migration + grunt works