SSW 555 - P04  -Team 5

MCL: US01 - Code Refactoring - improve data structures, file read,
etc... Bug fix.