Changed puts to warn
deleted accidental file
Moved user editable files into more logical directories
Updated comments