Fixed directory structure so that it is considerably more modular.

Added recursive makefile for posterity and ease of the right now.