Moved all the models into one project

I felt like there was too much redundancy with having two model groups
in two different projects. I have since then fixed it and moved them
into the Database project.