Moved DataBase.java into a better place