Removed some stuff that shouldn't be here.
Also made sure names of folders are consistent.