file reorganization and path updates