Restructure folder , orgnization