Move drawing and geometry reference to top level
Add redirects for old locations