Restructuring of files to a more program centered model
Restructing of files to a more program centered model