Refactored code to keep it better organized.
Renamed variables, removed commented code.
New test scripts using Make.