updated require lines, refactored Database.js more