Made some small file structure changes