Code reorganization, major work on content package + resource reference linking.