re structuring all files