Fixed organization mistakes from last commit.