Re-structured everything; to write tests
Written tests and modified Makefile, for now this closes #1