Do away with the "includes" folder... just keep everything under src

I don't know where I got the idea to have a separate includes folder, but it turns out to be inconvenient, so I changed
my mind. All of the .h files will now just go next to their corresponding .cpp files. Eclipse likes it better this way,
and doing it the other way had no apparent advantages.