Introducing Some structure into the codebase.

It's pull-ready at this point.