Formatting
Files, folders and further separation of concerns