updated files from git."
conflict resolution
File structured corrected. Bugs fixed.