Restructured a bit of the solution and starting driving out first pieces of behavior.
Deleting files that shouldnt be tracked.