Reorganize files into folders
Lol move database again
Some changes, can't remember that much