Cleaned up old folder and compiled code
test: Reorganized.
	TODO Make actual unit test?