restructure the foloders