Code cleanup and rellocation of some files in unavailing attempt to have Model directory independent from View directory.