Code: Improved file structure