Fix little organizational issues.