Changed file names, commented on some stuff