cleanup: file reorganization