Cleaned up some old files, renamed others for clarity