cleanup 

several changes to make it install properly and remove superfluous files