Changes project structure to be slightly more sane.

Signed-off-by: Philip Vitesnik <pvitesnik@gmail.com>