cleanup makefile and separate script binding further
Move code into src and test directories
fix build for moved directories
Extend Item test
Fix incorrect override
astyle