file organization and some added vendor prefixes