Moved base guides to own package, and import cleanup.