better layout / partial folder structure