Began file structure optimization