Refactor components out of core namespace.