Reorganization: resolved dependency issues