Separated classes and added DB file