more restructuring
structured so that libs can be accessed via FindBin