Directory structure changed. Added mutable support.