Added a makefile
Moved default to core, changing structure as well
Changing structure, implementing pattern expressed by @monokrome here: http://goo.gl/vXH9w
Not using test by default, removed