Cleaned up the code and renamed some files.
w