Reorganize to accommodate a more pluggable system