Restructure and consolidate functionality of local and remote assets into Asset.