move extension points to more appropriate plug-ins