Dev Some changes.
Dev: Fixed for case-sensitive filesystems