Removed remaining single file, merged programming aids.