Renaming files and putting them in subfolders

Arduino IDE was fussing that I had named the files badly and they
weren't in folders.  I believe I've fixed that now.