Re-Organizing AWS Files