Changed the foders structure