Name and code formatting updates.

Changed some file and package names, neatened certain parts of code.