Refactors to handle new properties/directory format