Continue improving the file structure