I think that's great. I do have a fork of the more-or-less "official" repository on github, perhaps that would be a better starting point? I think what you're trying to do is great, but forking from something that's closer to the structure of the "official" project would increase the ease of merging in upstream changes.
Thanks for the heads-up. The "official" code doesn't seem to have been updated since September last year so is there any chance of getting stuff merged? Although it would be nice to, one of the main reasons I decided to make my own repository was because I didn't like the way the original code was organised and the lack of any kind of build system.
Anyway, there don't seem to have been many commits so it shouldn't be too difficult to merge what changes have been made into my source tree manually.