rename and reoganise file structure