Fix Files Organization