Break out components to separate modules