Modifications to make new file structure work