Corrected some folder names (mainly to try out git mv...)