Fix some organization