Updated with new structure of folders