updating file structure for better support later