[IMP] Improved structure of the files