Organize folders into a better structure.

Trim the fat so to speak. Also cleaning up the code to be more
presentable as I am ripping it out of the working code base.