[master] Fix structure of files