Reshuffled functions around.
Added Makefile and changed names.