Make new layout for data providers work, implement Fedora first