WIP - reorganized project + misc improvements - Jamie