New Make-System and cleaned up nearly everything in all subdirs.