major changes to file layout