Fixed organization issues