project refactor for the reqs for v1.0 release