restructured repository structure