Updated structure
Updated structure (fixing conflicts)