Incorporate number-formatter, split to multiple files