Improved file structure to avoid confusion