Restructured a couple files.