Fixed folder heriacrchy. Editted a few other things.