More package reorganization. Starting Canvas planning for the Scene Graph.