Improved file structure