rename folders and some restructure