A quick updated Commit

Nothing huge happened here, just some reorganization.