Restructured include/ and src/ (Linux and OSX untested)