cleanup makefile and separate script binding further
Move code into src and test directories