Move Formatter into formatter
Merge pull request #5 from kpcyrd/formatter

Move Formatter into formatter