Restructure repo and use full import paths.
Reorder import paths.