Moved stuff all around, much better organization.