jam support
tidy up
moved some files