Rearranged the files a bit to fit the Arduino build environment better