Refactor names. Remove ds store mac files