Reworked the file layout. It still sucks. I don't really like the file structure that the Arduino platform imposes.