Fixed organization issues.