adjusting directory structure, removing ~ files