Cleanup of Content files with linking, and cleaned up source structure in linked projects