Minor changes, changed folder names and minor stuff