restructured repo to simplify a bit