Remove unhelpful comments
Clean up files (StyleCop)
Split types out into matching files
Move Interfaces out into sep namespaces.