Cleanup and move auxiliary components to ext