Cleaned up the code, renamed the files.