Significant restructure; switched to SCons