Reorganize files
Convert windows line endings to mac