changed structure to support postcss