Changed dir structure and emptied database