File restructure. Hopefully indentations are fixed.