milestone : SingleFile - deviating

from here on the the single file is going to have additional code. the
changes will therefore have to be brought into the individual files
later . these new changes should be earmarked