Updated structure and renamed file