Begin breaking out components into separate modules