Renamed and re-organized to follow book conventions

Signed-off-by: Christian Romney <cromney@pointslope.com>