Adding basic file infrastructure