Moved everything around and updated a lot.