Rewrote classes to take advantage of methods better. Replaced files with new files.