Restructured the Resources dependancy