Remade file structure so that structures are at top.