Organized user and db
Cleaned up and made the test makefile better