New file structure clearly separating databases
fixed conflict