Big refactor change in the resources directories