Database Restructuring in main project