We should rename the file here also to prefent confusions

Also added some headers I missed