Organized the Database