Moving components into their own directory, cleaning up some imports