Split Directory into Media and Directory, contained in Content
Sort struct definitions and initializers for readability