cleanup solution.
reformat code.
add missing files.