Started restructuring the database