Changed names and locations, preparing parsing of drawables etc