renamed stuff
fix merge
reformatted data, made new content parser