Updated
Clean up directory structure
Clarification