rename and restructure components and files