Cleanup and added a couple new files.