this is more like the proper folder structure