restructured repo so working source is top level