Further file removes / renames
Cosmetic fixes
Update command line apps to new repositories / libraries approach.